Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlad Mihaylenko <vxmihaylenko@gmail.com>2016-09-26 16:07:15 +0300
committerGitHub <noreply@github.com>2016-09-26 16:07:15 +0300
commita115d10958f8617196d7c286ca04487ebfaee0ef (patch)
treebc08829879906c04a7dd32834491129a1f659ef9
parent68fa69880e88d46cb93ec1b472bd638dcab1dd83 (diff)
parentda12a3cf4fa1c102934e111dc803ee625d480208 (diff)
Merge pull request #4381 from bykoianko/release-64-to-master
release-64 to master
-rw-r--r--android/gradle.properties4
-rw-r--r--android/jni/com/mapswithme/core/jni_helper.cpp3
-rw-r--r--android/jni/com/mapswithme/core/jni_helper.hpp1
-rw-r--r--android/jni/com/mapswithme/platform/Platform.cpp17
-rw-r--r--android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.pngbin0 -> 47188 bytes
-rw-r--r--android/res/drawable-hdpi/ic_img_whatsnew_route_profile.pngbin0 -> 59574 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.pngbin0 -> 30953 bytes
-rw-r--r--android/res/drawable-mdpi/ic_img_whatsnew_route_profile.pngbin0 -> 37157 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.pngbin0 -> 62177 bytes
-rw-r--r--android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.pngbin0 -> 80068 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.pngbin0 -> 93526 bytes
-rw-r--r--android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.pngbin0 -> 128615 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.pngbin0 -> 73926 bytes
-rw-r--r--android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.pngbin0 -> 104828 bytes
-rw-r--r--android/res/layout-land/altitude_chart_panel.xml4
-rw-r--r--android/res/layout-land/layout_nav_bottom_numbers.xml16
-rw-r--r--android/res/layout/edit_bookmark_common.xml5
-rw-r--r--android/res/layout/layout_nav_bottom_numbers.xml14
-rw-r--r--android/res/values-ar/strings.xml8
-rw-r--r--android/res/values-cs/strings.xml8
-rw-r--r--android/res/values-da/strings.xml8
-rw-r--r--android/res/values-de/strings.xml4
-rw-r--r--android/res/values-es/strings.xml8
-rw-r--r--android/res/values-fi/strings.xml8
-rw-r--r--android/res/values-fr/strings.xml8
-rw-r--r--android/res/values-hu/strings.xml8
-rw-r--r--android/res/values-in/strings.xml8
-rw-r--r--android/res/values-it/strings.xml8
-rw-r--r--android/res/values-ja/strings.xml8
-rw-r--r--android/res/values-ko/strings.xml8
-rw-r--r--android/res/values-nb/strings.xml8
-rw-r--r--android/res/values-nl/strings.xml8
-rw-r--r--android/res/values-pl/strings.xml8
-rw-r--r--android/res/values-pt/strings.xml8
-rw-r--r--android/res/values-ro/strings.xml8
-rw-r--r--android/res/values-ru/strings.xml4
-rw-r--r--android/res/values-sk/strings.xml8
-rw-r--r--android/res/values-sv/strings.xml8
-rw-r--r--android/res/values-th/strings.xml8
-rw-r--r--android/res/values-tr/strings.xml8
-rw-r--r--android/res/values-uk/strings.xml8
-rw-r--r--android/res/values-vi/strings.xml8
-rw-r--r--android/res/values-zh-rTW/strings.xml6
-rw-r--r--android/res/values-zh/strings.xml8
-rw-r--r--android/res/values/arrays.xml18
-rw-r--r--android/res/values/dimens.xml1
-rw-r--r--android/res/values/strings.xml4
-rw-r--r--android/res/values/styles-text.xml9
-rw-r--r--android/src/com/mapswithme/maps/DownloadResourcesActivity.java44
-rw-r--r--android/src/com/mapswithme/maps/MapFragment.java14
-rw-r--r--android/src/com/mapswithme/maps/MwmActivity.java29
-rw-r--r--android/src/com/mapswithme/maps/MwmApplication.java38
-rw-r--r--android/src/com/mapswithme/maps/base/BaseActivityDelegate.java3
-rw-r--r--android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java16
-rw-r--r--android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java7
-rw-r--r--android/src/com/mapswithme/maps/editor/EditorHostFragment.java76
-rw-r--r--android/src/com/mapswithme/maps/location/TrackRecorder.java15
-rw-r--r--android/src/com/mapswithme/maps/routing/RoutingController.java3
-rw-r--r--android/src/com/mapswithme/maps/routing/RoutingPlanController.java19
-rw-r--r--android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java17
-rw-r--r--android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java14
-rw-r--r--android/src/com/mapswithme/maps/routing/SearchWheel.java1
-rw-r--r--android/src/com/mapswithme/maps/widget/ToolbarController.java3
-rw-r--r--android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java2
-rw-r--r--android/src/com/mapswithme/maps/widget/placepage/SponsoredHotel.java24
-rw-r--r--android/src/com/mapswithme/util/StorageUtils.java47
-rw-r--r--android/src/com/mapswithme/util/sharing/BaseShareable.java2
-rw-r--r--android/src/com/mapswithme/util/sharing/MapObjectShareable.java60
-rw-r--r--android/src/com/mapswithme/util/sharing/ShareOption.java9
-rw-r--r--android/src/com/mapswithme/util/statistics/Statistics.java12
-rw-r--r--data/World.mwmbin35166831 -> 35208957 bytes
-rw-r--r--data/WorldCoasts.mwmbin4631224 -> 4635218 bytes
-rw-r--r--data/countries.txt2248
-rw-r--r--data/external_resources.txt4
-rw-r--r--data/languages.txt2
-rw-r--r--drape_frontend/backend_renderer.cpp6
-rwxr-xr-xdrape_frontend/frontend_renderer.cpp22
-rwxr-xr-xdrape_frontend/frontend_renderer.hpp2
-rw-r--r--drape_frontend/gps_track_renderer.cpp2
-rw-r--r--drape_frontend/message_subclasses.hpp22
-rw-r--r--drape_frontend/route_builder.cpp9
-rw-r--r--drape_frontend/route_builder.hpp6
-rw-r--r--drape_frontend/route_shape.hpp3
-rw-r--r--iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm1
-rw-r--r--iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm2
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm20
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.xib139
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm3
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm1
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm1
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/MWMSearchTabbedViewProtocol.h1
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.h5
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/MWMWhatsNewProfileBookingController.mm68
-rw-r--r--iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/Welcome.storyboard324
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm16
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.xib28
-rw-r--r--iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib112
-rw-r--r--iphone/Maps/Classes/MWMTypes.h1
-rw-r--r--iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm15
-rw-r--r--iphone/Maps/Classes/MapViewController.mm4
-rw-r--r--iphone/Maps/Classes/MapsAppDelegate.mm2
-rw-r--r--iphone/Maps/Classes/Routing/MWMRouter.h4
-rw-r--r--iphone/Maps/Classes/Routing/MWMRouter.mm11
-rw-r--r--iphone/Maps/Images.xcassets/AppIcon.appiconset/Contents.json20
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json (renamed from iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json)9
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.pngbin0 -> 106 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.pngbin0 -> 130 bytes
-rw-r--r--iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.pngbin0 -> 153 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.pngbin17944 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.pngbin36380 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.pngbin86232 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.pngbin20797 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.pngbin39980 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.pngbin88149 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.pngbin22761 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.pngbin48733 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.pngbin80567 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.pngbin26144 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.pngbin70672 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.pngbin137200 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.pngbin25221 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.pngbin51286 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.pngbin80604 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/Contents.json23
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.pngbin31295 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.pngbin66047 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.pngbin106350 -> 0 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json (renamed from iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json)6
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.pngbin0 -> 37157 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.pngbin0 -> 80068 bytes
-rw-r--r--iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.pngbin0 -> 128615 bytes
-rw-r--r--iphone/Maps/MAPSME.plist4
-rw-r--r--iphone/Maps/MWMAboutController.mm6
-rw-r--r--iphone/Maps/Maps.xcodeproj/project.pbxproj63
-rw-r--r--iphone/Maps/Mapsme.storyboard1035
-rw-r--r--iphone/Maps/ar.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/cs.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/da.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/de.lproj/Localizable.strings8
-rw-r--r--iphone/Maps/en-GB.lproj/Localizable.strings8
-rw-r--r--iphone/Maps/en.lproj/Localizable.strings8
-rw-r--r--iphone/Maps/es.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/fi.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/fr.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/hu.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/id.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/it.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/ja.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/ko.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/main.mm10
-rw-r--r--iphone/Maps/nb.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/nl.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/pl.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/pt.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/ro.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/ru.lproj/Localizable.strings8
-rw-r--r--iphone/Maps/sk.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/sv.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/th.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/tr.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/uk.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/vi.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/zh-Hans.lproj/Localizable.strings12
-rw-r--r--iphone/Maps/zh-Hant.lproj/Localizable.strings10
-rw-r--r--map/framework.cpp15
-rw-r--r--routing/routing_integration_tests/osrm_route_test.cpp18
-rw-r--r--routing/routing_tests/turns_generator_test.cpp39
-rw-r--r--routing/turns_generator.cpp4
-rw-r--r--routing/turns_generator.hpp7
-rw-r--r--search/processor.cpp1
-rw-r--r--storage/storage.cpp1
-rw-r--r--strings.txt173
175 files changed, 3392 insertions, 2262 deletions
diff --git a/android/gradle.properties b/android/gradle.properties
index 94434558b6..813c4f5ace 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=642
+propVersionName=6.4.2
propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp
index 5bf37b0ae0..0524197558 100644
--- a/android/jni/com/mapswithme/core/jni_helper.cpp
+++ b/android/jni/com/mapswithme/core/jni_helper.cpp
@@ -16,6 +16,7 @@ extern JavaVM * GetJVM()
// caching is necessary to create class from native threads
jclass g_mapObjectClazz;
jclass g_bookmarkClazz;
+jclass g_myTrackerClazz;
extern "C"
{
@@ -29,6 +30,7 @@ JNI_OnLoad(JavaVM * jvm, void *)
JNIEnv * env = jni::GetEnv();
g_mapObjectClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/MapObject");
g_bookmarkClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/Bookmark");
+ g_myTrackerClazz = jni::GetGlobalClassRef(env, "com/my/tracker/MyTracker");
return JNI_VERSION_1_6;
}
@@ -40,6 +42,7 @@ JNI_OnUnload(JavaVM *, void *)
JNIEnv * env = jni::GetEnv();
env->DeleteGlobalRef(g_mapObjectClazz);
env->DeleteGlobalRef(g_bookmarkClazz);
+ env->DeleteGlobalRef(g_myTrackerClazz);
}
} // extern "C"
diff --git a/android/jni/com/mapswithme/core/jni_helper.hpp b/android/jni/com/mapswithme/core/jni_helper.hpp
index 6ac621c37c..5e507d0bcc 100644
--- a/android/jni/com/mapswithme/core/jni_helper.hpp
+++ b/android/jni/com/mapswithme/core/jni_helper.hpp
@@ -11,6 +11,7 @@
extern jclass g_mapObjectClazz;
extern jclass g_bookmarkClazz;
+extern jclass g_myTrackerClazz;
namespace jni
{
diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 16793dcccc..ee36652ffe 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -86,7 +86,22 @@ void Platform::SendPushWooshTag(string const & tag, vector<string> const & value
void Platform::SendMarketingEvent(string const & tag, map<string, string> const & params)
{
- // TODO: Add implementation.
+ JNIEnv * env = jni::GetEnv();
+ if (env == nullptr)
+ return;
+
+ string eventData = tag;
+
+ for (auto const & item : params)
+ {
+ eventData.append("_" + item.first + "_" + item.second);
+ }
+
+ static jmethodID const myTrackerTrackEvent =
+ env->GetStaticMethodID(g_myTrackerClazz, "trackEvent", "(Ljava/lang/String;)V");
+
+ env->CallStaticVoidMethod(g_myTrackerClazz, myTrackerTrackEvent,
+ jni::TScopedLocalRef(env, jni::ToJavaString(env, eventData)).get());
}
Platform::EConnectionType Platform::ConnectionStatus()
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
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_img_whatsnew_booking_improve.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-hdpi/ic_img_whatsnew_route_profile.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_img_whatsnew_booking_improve.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_img_whatsnew_route_profile.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_img_whatsnew_booking_improve.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xhdpi/ic_img_whatsnew_route_profile.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_img_whatsnew_booking_improve.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xxhdpi/ic_img_whatsnew_route_profile.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/ic_img_whatsnew_booking_improve.png
Binary files 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
--- /dev/null
+++ b/android/res/drawable-xxxhdpi/ic_img_whatsnew_route_profile.png
Binary files differ
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 @@
<ImageView
android:id="@+id/altitude_chart"
android:layout_width="@dimen/altitude_chart_image_width"
- android:layout_height="@dimen/altitude_chart_image_height"
- android:layout_marginBottom="8dp"/>
+ android:layout_height="@dimen/altitude_chart_image_height"/>
</LinearLayout>
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"/>
<TextView
@@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="km/h"/>
</LinearLayout>
@@ -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"/>
<TextView
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_quarter"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="h"/>
<TextView
@@ -81,7 +81,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="99"/>
<TextView
@@ -89,7 +89,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="m"/>
</LinearLayout>
@@ -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"/>
<TextView
@@ -145,7 +145,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="km"/>
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/android/res/layout/edit_bookmark_common.xml b/android/res/layout/edit_bookmark_common.xml
index 9fec7272c5..ab0238effa 100644
--- a/android/res/layout/edit_bookmark_common.xml
+++ b/android/res/layout/edit_bookmark_common.xml
@@ -79,7 +79,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/height_item_edit_bookmark"
+ android:layout_height="wrap_content"
android:layout_below="@id/rl__bookmark_set"
android:layout_margin="@dimen/margin_half"
android:orientation="vertical"
@@ -94,8 +94,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/edit_description_hint"
- android:inputType="text"
- android:singleLine="false"/>
+ android:inputType="textMultiLine"/>
</com.mapswithme.maps.widget.CustomTextInputLayout>
</LinearLayout>
</RelativeLayout> \ 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"/>
<TextView
@@ -65,7 +65,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"/>
<TextView
@@ -75,7 +75,7 @@
android:layout_marginRight="@dimen/margin_quarter"
android:layout_marginEnd="@dimen/margin_quarter"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="h"/>
<TextView
@@ -83,7 +83,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="99"/>
<TextView
@@ -91,7 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/MwmTextAppearance.RoutingDimension.Inline"
+ android:textAppearance="@style/MwmTextAppearance.RoutingNumber"
tools:text="m"/>
</LinearLayout>
@@ -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">
<ImageView
android:id="@+id/dot_left"
@@ -141,7 +143,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="99999"/>
<TextView
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 340aca1304..2bbfab6f7c 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -721,6 +721,10 @@
<string name="place_name">اسم المكان</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">لغات أخرى</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">إظهار المزيد</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">إظهار أقل</string>
<string name="add_language">إضافة لغة</string>
<string name="street">الشارع</string>
<!-- Editable House Number text field (in address block). -->
@@ -945,4 +949,8 @@
<string name="accept">قبول</string>
<!-- For the first routing -->
<string name="decline">رفض</string>
+ <string name="whats_new_route_profile_title">الأفضل العثور على حل بدلا من السقوط في خندق</string>
+ <string name="whats_new_route_profile_message">بالنسبة لمسارات المشاة والدراجات نحن الآن نعرض تشكيل الارتفاع.</string>
+ <string name="whats_new_booking_improve_title">توفير عند حجز الفنادق</string>
+ <string name="whats_new_booking_improve_message">تحتوي نتائج البحث عن الفنادق الآن على فئة السعر.\nوأضفنا أيضًا أكثر من 110000 فندق.</string>
</resources>
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 @@
<string name="place_name">Název místa</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Další jazyky</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Zobrazit více</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Zobrazit méně</string>
<string name="add_language">Přidat jazyk</string>
<string name="street">Ulice</string>
<!-- Editable House Number text field (in address block). -->
@@ -946,4 +950,8 @@
<string name="accept">Přijmout</string>
<!-- For the first routing -->
<string name="decline">Odmítnout</string>
+ <string name="whats_new_route_profile_title">Nejlepší je vyřešit to jednou pro vždy</string>
+ <string name="whats_new_route_profile_message">U pěších a cyklistických tras nyní zobrazujeme výškový profil.</string>
+ <string name="whats_new_booking_improve_title">Ušetřete při rezervaci hotelů</string>
+ <string name="whats_new_booking_improve_message">Výsledky hledání hotelů nyní obsahují cenové kategorie. \nTaké jsme přidali více než 110 000 hotelů.</string>
</resources>
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 @@
<string name="place_name">Navn på sted</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Andre sprog</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Vis mere</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Vis mindre</string>
<string name="add_language">Tilføj et sprog</string>
<string name="street">Gade</string>
<!-- Editable House Number text field (in address block). -->
@@ -943,4 +947,8 @@
<string name="accept">Accepter</string>
<!-- For the first routing -->
<string name="decline">Afvis</string>
+ <string name="whats_new_route_profile_title">Spring over hvor gærdet er lavest</string>
+ <string name="whats_new_route_profile_message">Vi viser nu højdeprofilen for fodgænger- og cykelruter.</string>
+ <string name="whats_new_booking_improve_title">Spar penge når du bestiller hotelværelser</string>
+ <string name="whats_new_booking_improve_message">Søgeresultater for hoteller viser nu også priskategorien.\nVi har desuden tilføjet mere end 110.000 hoteller.</string>
</resources>
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 @@
<string name="accept">Annehmen</string>
<!-- For the first routing -->
<string name="decline">Ablehnen</string>
+ <string name="whats_new_route_profile_title">Am besten den leichtesten Weg gehen</string>
+ <string name="whats_new_route_profile_message">Für Fußgänger- und Fahrradrouten zeigen wir nun das Höhenprofil an.</string>
+ <string name="whats_new_booking_improve_title">Beim Buchen von Hotels sparen</string>
+ <string name="whats_new_booking_improve_message">Suchergebnisse für Hotels enthalten jetzt die Kategorie Preis.\nAußerdem haben wir über 110.000 Hotels hinzugefügt.</string>
</resources>
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 @@
<string name="place_name">Nombre del lugar</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Otros idiomas</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Mostrar más</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Mostrar menos</string>
<string name="add_language">Añadir un idioma</string>
<string name="street">Calle</string>
<!-- Editable House Number text field (in address block). -->
@@ -934,4 +938,8 @@
<string name="accept">Aceptar</string>
<!-- For the first routing -->
<string name="decline">Declinar</string>
+ <string name="whats_new_route_profile_title">Más vale rodear que no ahogar</string>
+ <string name="whats_new_route_profile_message">Ahora se muestra el perfil de elevación en los itinerarios pedestres y en bicicleta.</string>
+ <string name="whats_new_booking_improve_title">Ahorrar al reservar hoteles</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="place_name">Paikan nimi</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Muut Kielet</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Näytä lisää</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Näytä vähemmän</string>
<string name="add_language">Lisää kieli</string>
<string name="street">Katu</string>
<!-- Editable House Number text field (in address block). -->
@@ -939,4 +943,8 @@
<string name="accept">Hyväksy</string>
<!-- For the first routing -->
<string name="decline">Hylkää</string>
+ <string name="whats_new_route_profile_title">Parempi katsoa kuin katua</string>
+ <string name="whats_new_route_profile_message">Näytämme nyt maaston korkeuden kävely- ja pyöräilyreittejä varten.</string>
+ <string name="whats_new_booking_improve_title">Säästä hotellivarauksissa</string>
+ <string name="whats_new_booking_improve_message">Hotellien hakutuloksissa näkyy nyt hintakategoria.\nLisäsimme myös yli 110 000 hotellia.</string>
</resources>
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 @@
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Autres langues</string>
<!-- small button to open list with names in different languages -->
- <string name="show_more">Voir plus</string>
+ <string name="show_more">Afficher plus</string>
<!-- small button to close list with names in different languages -->
- <string name="show_less">Voir moins</string>
+ <string name="show_less">Afficher moins</string>
<string name="add_language">Ajouter une langue</string>
<string name="street">Rue</string>
<!-- Editable House Number text field (in address block). -->
@@ -962,4 +962,8 @@
<string name="accept">Accepter</string>
<!-- For the first routing -->
<string name="decline">Refuser</string>
+ <string name="whats_new_route_profile_title">C\&#39;est en se bougeant que l\&#39;on trouve des solutions</string>
+ <string name="whats_new_route_profile_message">Pour les routes pédestres et cyclables nous affichons maintenant le profil d\&#39;élévation.</string>
+ <string name="whats_new_booking_improve_title">Économisez de l\&#39;argent en réservant des hôtels</string>
+ <string name="whats_new_booking_improve_message">Les résultats des recherches d\&#39;hôtels comprennent maintenant la catégorie de prix.\nNous avons aussi ajouté plus de 110.000 hôtels.</string>
</resources>
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 @@
<string name="place_name">Hely neve</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Más nyelv</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Továbbiak megjelenítése</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Kevesebb megjelenítése</string>
<string name="add_language">Nyelv hozzáadása</string>
<string name="street">Utca</string>
<!-- Editable House Number text field (in address block). -->
@@ -939,4 +943,8 @@
<string name="accept">Elfogadja</string>
<!-- For the first routing -->
<string name="decline">Elutasítja</string>
+ <string name="whats_new_route_profile_title">Az árkot jobb megkerülni, mint beleesni</string>
+ <string name="whats_new_route_profile_message">A gyalogos és kerékpáros utakat most már emelkedési profillal jelenítjük meg.</string>
+ <string name="whats_new_booking_improve_title">Takarékoskodjon szálláshely foglalásakor</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="place_name">Nama tempat</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Bahasa lainnya</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Selengkapnya</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Kurangi</string>
<string name="add_language">Tambahkan bahasa</string>
<string name="street">Jalan</string>
<!-- Editable House Number text field (in address block). -->
@@ -938,4 +942,8 @@
<string name="accept">Terima</string>
<!-- For the first routing -->
<string name="decline">Tolak</string>
+ <string name="whats_new_route_profile_title">Jalan-jalan dengan lebih aman dan nyaman</string>
+ <string name="whats_new_route_profile_message">Untuk rute pejalan kaki dan sepeda, kami kini menampilkan profil elevasi.</string>
+ <string name="whats_new_booking_improve_title">Berhemat saat memesan hotel</string>
+ <string name="whats_new_booking_improve_message">Hasil pencarian untuk hotel kini disertai kategori harga.\nKami juga menambahkan lebih dari 110.000 hotel.</string>
</resources>
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 @@
<string name="place_name">Nome del luogo</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Altre lingue</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Mostra altro</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Mostra meno</string>
<string name="add_language">Aggiungi una lingua</string>
<string name="street">Via</string>
<!-- Editable House Number text field (in address block). -->
@@ -938,4 +942,8 @@
<string name="accept">Accetta</string>
<!-- For the first routing -->
<string name="decline">Rifiuta</string>
+ <string name="whats_new_route_profile_title">Meglio è tornar indietro, che correr male avanti</string>
+ <string name="whats_new_route_profile_message">Per gli itinerari pedonali e ciclabili, è ora visualizzato il profilo altimetrico.</string>
+ <string name="whats_new_booking_improve_title">Risparmia alla prenotazione degli hotel</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="place_name">場所の名前</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">その他の言語</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">表示を増やす</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">表示を減らす</string>
<string name="add_language">言語を追加</string>
<string name="street">通り</string>
<!-- Editable House Number text field (in address block). -->
@@ -938,4 +942,8 @@
<string name="accept">了解</string>
<!-- For the first routing -->
<string name="decline">拒否</string>
+ <string name="whats_new_route_profile_title">時は金なり。古きを捨て新しきを得よう。</string>
+ <string name="whats_new_route_profile_message">歩行者とバイク用のルートに高度プロファイルが表示されるようになりました。</string>
+ <string name="whats_new_booking_improve_title">ホテル予約時に節約しましょう</string>
+ <string name="whats_new_booking_improve_message">ホテルの検索結果に価格のカテゴリーが表示されるようになりました。\nさらに、 110,000 軒を超えるホテルを追加しました。</string>
</resources>
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 @@
<string name="place_name">지명</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">다른 언어</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">자세히 표시</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">간단히 표시</string>
<string name="add_language">언어 추가</string>
<string name="street">거리</string>
<!-- Editable House Number text field (in address block). -->
@@ -935,4 +939,8 @@
<string name="accept">동의</string>
<!-- For the first routing -->
<string name="decline">거부</string>
+ <string name="whats_new_route_profile_title">문제가 있으면 계속 어려움을 겪는 것보다 그만두는 게 낫습니다.</string>
+ <string name="whats_new_route_profile_message">보행자 및 자전거 도로를 위해 이제 고도 단면을 표시합니다.</string>
+ <string name="whats_new_booking_improve_title">호텔 예약 시 절약</string>
+ <string name="whats_new_booking_improve_message">이제 가격 범주를 포함하는 호텔에 대한 결과를 검색하세요.\n또한 110,000곳 이상의 호텔이 추가되었습니다.</string>
</resources>
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 @@
<string name="place_name">Stedsnavn</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Andre språk</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Vis mer</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Vis mindre</string>
<string name="add_language">Legg til et språk</string>
<string name="street">Gate</string>
<!-- Editable House Number text field (in address block). -->
@@ -937,4 +941,8 @@
<string name="accept">Godta</string>
<!-- For the first routing -->
<string name="decline">Avvis</string>
+ <string name="whats_new_route_profile_title">Range vegen vert ikkje rett om det er mange som går han</string>
+ <string name="whats_new_route_profile_message">Vi viser nå høydeprofilen med tanke på gå- og sykkelruter.</string>
+ <string name="whats_new_booking_improve_title">Spar penger når du bestiller hotell</string>
+ <string name="whats_new_booking_improve_message">Søkeresultatene for hoteller inneholder nå priskategori.\nVi har også lagt til flere enn 110.000 hoteller.</string>
</resources>
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 @@
<string name="place_name">Locatienaam</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Overige talen</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Meer Tonen</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Minder Tonen</string>
<string name="add_language">Een taal toevoegen</string>
<string name="street">Straat</string>
<!-- Editable House Number text field (in address block). -->
@@ -939,4 +943,8 @@
<string name="accept">Aanvaarden</string>
<!-- For the first routing -->
<string name="decline">Weigeren</string>
+ <string name="whats_new_route_profile_title">Beter ten halve gekeerd, dan ten hele gedwaald</string>
+ <string name="whats_new_route_profile_message">Voor wandel- en fietsroutes geven we nu het hoogteprofiel weer.</string>
+ <string name="whats_new_booking_improve_title">Bespaar op het boeken van hotels</string>
+ <string name="whats_new_booking_improve_message">Zoekresultaten voor hotels bevatten nu de prijscategorie.\nWe hebben ook meer dan 110.000 hotels toegevoegd.</string>
</resources>
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 @@
<string name="place_name">Nazwa miejsca</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Inne języki</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Pokaż więcej</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Pokaż mniej</string>
<string name="add_language">Dodaj język</string>
<string name="street">Ulica</string>
<!-- Editable House Number text field (in address block). -->
@@ -948,4 +952,8 @@
<string name="accept">Zaakceptuj</string>
<!-- For the first routing -->
<string name="decline">Odrzuć</string>
+ <string name="whats_new_route_profile_title">Kto drogi prostuje, ten w domu nie nocuje</string>
+ <string name="whats_new_route_profile_message">Dla tras pieszych i rowerowych pokazujemy teraz też profil wysokościowy.</string>
+ <string name="whats_new_booking_improve_title">Oszczędzaj przy rezerwacji hotelów</string>
+ <string name="whats_new_booking_improve_message">Wyniki wyszukiwania hoteli zawierają teraz kategorię cenową. \nDodaliśmy też ponad 110 000 hoteli.</string>
</resources>
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 @@
<string name="place_name">Nome do local</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Outros idiomas</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Mostrar mais</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Mostrar Menos</string>
<string name="add_language">Adicionar um idioma</string>
<string name="street">Rua</string>
<!-- Editable House Number text field (in address block). -->
@@ -938,4 +942,8 @@
<string name="accept">Aceitar</string>
<!-- For the first routing -->
<string name="decline">Declinar</string>
+ <string name="whats_new_route_profile_title">Circular é viver</string>
+ <string name="whats_new_route_profile_message">Nas rotas para peões e ciclovias apresentamos agora o perfil de elevação.</string>
+ <string name="whats_new_booking_improve_title">Poupe nas reservas de hotéis</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="place_name">Denumire loc</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Alte limbi</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Arată mai multe</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Arată mai puține</string>
<string name="add_language">Adăugare limbă</string>
<string name="street">Stradă</string>
<!-- Editable House Number text field (in address block). -->
@@ -935,4 +939,8 @@
<string name="accept">Acceptați</string>
<!-- For the first routing -->
<string name="decline">Refuzați</string>
+ <string name="whats_new_route_profile_title">Mai bine căutați soluții decât să greșiți</string>
+ <string name="whats_new_route_profile_message">Pentru rutele pentru pietoni și bicicliști, afișam acum profilul de elevație.</string>
+ <string name="whats_new_booking_improve_title">Economisiți bani când rezervați hoteluri</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="accept">Принять</string>
<!-- For the first routing -->
<string name="decline">Отклонить</string>
+ <string name="whats_new_route_profile_title">Умный в гору не пойдет</string>
+ <string name="whats_new_route_profile_message">На пеших и веломаршрутах отображается профиль рельефа.</string>
+ <string name="whats_new_booking_improve_title">Экономь на бронировании отеля</string>
+ <string name="whats_new_booking_improve_message">Результаты поиска отелей на карте показывают ценовую категорию.\nОтелей для бронирования стало на 110 000 больше.</string>
</resources>
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 @@
<string name="place_name">Názov miesta</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Iné jazyky</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Ukázať viac</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Ukázať menej</string>
<string name="add_language">Pridať jazyk</string>
<string name="street">Ulica</string>
<!-- Editable House Number text field (in address block). -->
@@ -942,4 +946,8 @@
<string name="accept">Prijať</string>
<!-- For the first routing -->
<string name="decline">Odmietnuť</string>
+ <string name="whats_new_route_profile_title">Radšej dlhšia cesta, ale bezpečná</string>
+ <string name="whats_new_route_profile_message">Pre pešie trasy a cyklotrasy sa odteraz zobrazuje aj výškový profil.</string>
+ <string name="whats_new_booking_improve_title">Ušetriť pri rezervácii hotelov</string>
+ <string name="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.</string>
</resources>
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 @@
<string name="place_name">Platsens namn</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Övriga språk</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Visa mer</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Visa mindre</string>
<string name="add_language">Lägg till ett språk</string>
<string name="street">Gata</string>
<!-- Editable House Number text field (in address block). -->
@@ -943,4 +947,8 @@
<string name="accept">Acceptera</string>
<!-- For the first routing -->
<string name="decline">Neka</string>
+ <string name="whats_new_route_profile_title">Genvägar är senvägar</string>
+ <string name="whats_new_route_profile_message">För gångvägar och cykelturer visar vi nu höjdprofilen.</string>
+ <string name="whats_new_booking_improve_title">Spara pengar när du bokar hotell</string>
+ <string name="whats_new_booking_improve_message">Sökresultat för hotell innehåller nu priskategorin.\nVi har även lagt till över 110 000 hotell.</string>
</resources>
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 @@
<string name="place_name">ชื่อสถานที่</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">ภาษาอื่น ๆ</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">แสดงเพิ่มเติม</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">แสดงน้อยลง</string>
<string name="add_language">เพิ่มภาษา</string>
<string name="street">ถนน</string>
<!-- Editable House Number text field (in address block). -->
@@ -945,4 +949,8 @@
<string name="accept">ยอมรับ</string>
<!-- For the first routing -->
<string name="decline">ปฏิเสธ</string>
+ <string name="whats_new_route_profile_title">ทำให้มันจบดีกว่าปล่อยให้มันรบกวนอยู่</string>
+ <string name="whats_new_route_profile_message">สำหรับเส้นทางคนเดินเท้าและจักรยาน ตอนนี้เราแสดงโปรไฟล์ระดับความสูงแล้ว</string>
+ <string name="whats_new_booking_improve_title">ประหยัดเมื่อจองโรงแรม</string>
+ <string name="whats_new_booking_improve_message">การค้นหาโรงแรมตอนนี้มีหมวดหมู่ราคาแล้ว\nเรายังได้เพิ่มโรงแรมเข้ามากว่า 110,000 โรงแรมอีกด้วย</string>
</resources>
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 @@
<string name="place_name">Yer ismi</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Diğer Diller</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Daha fazla göster</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Daha az göster</string>
<string name="add_language">Bir dil ekle</string>
<string name="street">Sokak</string>
<!-- Editable House Number text field (in address block). -->
@@ -945,4 +949,8 @@
<string name="accept">Kabul</string>
<!-- For the first routing -->
<string name="decline">Ret</string>
+ <string name="whats_new_route_profile_title">Düz yoldan gitmek çukura düşmekten daha iyidir</string>
+ <string name="whats_new_route_profile_message">Yürüyüş ve bisiklet yolları şimdi yükseklik profilli olarak görüntüleniyor.</string>
+ <string name="whats_new_booking_improve_title">Otel rezervasyonlarınızdan tasarruf edin</string>
+ <string name="whats_new_booking_improve_message">Artık otel arama sonuçlarında fiyat kategorisi de gösteriliyor.\nVe 110,000\&#39;den fazla oteli sistemimize ekledik.</string>
</resources>
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 @@
<string name="place_name">Назва</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Інші мови</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Показати більше</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Показати менше</string>
<string name="add_language">Додати мову</string>
<string name="street">Вулиця</string>
<!-- Editable House Number text field (in address block). -->
@@ -943,4 +947,8 @@
<string name="accept">Прийняти</string>
<!-- For the first routing -->
<string name="decline">Відхилити</string>
+ <string name="whats_new_route_profile_title">Мудрий в гори б не звернув, мудрий гори б обминув</string>
+ <string name="whats_new_route_profile_message">Для пішохідних і велосипедних маршрутів тепер відображається профіль рельєфу.</string>
+ <string name="whats_new_booking_improve_title">Заощаджуйте на бронюванні готелів</string>
+ <string name="whats_new_booking_improve_message">В результатах пошуку готелів на карті відображається цінова категорія.\nКрім того, тепер у нашій базі даних з\&#39;явилося 110 000 нових готелів.</string>
</resources>
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 @@
<string name="place_name">Tên địa điểm</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">Ngôn ngữ khác</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">Hiển thị nhiều hơn</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">Hiển thị ít hơn</string>
<string name="add_language">Thêm ngôn ngữ</string>
<string name="street">Đường</string>
<!-- Editable House Number text field (in address block). -->
@@ -939,4 +943,8 @@
<string name="accept">Chấp nhận</string>
<!-- For the first routing -->
<string name="decline">Từ chối</string>
+ <string name="whats_new_route_profile_title">Đi đường vòng vẫn tốt hơn là rơi xuống hố</string>
+ <string name="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.</string>
+ <string name="whats_new_booking_improve_title">Tiết kiệm khi đặt khách sạn</string>
+ <string name="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.</string>
</resources>
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 @@
<!-- small button to open list with names in different languages -->
<string name="show_more">顯示更多</string>
<!-- small button to close list with names in different languages -->
- <string name="show_less">顯示較少</string>
+ <string name="show_less">顯示更少</string>
<string name="add_language">新增語言</string>
<string name="street">街道</string>
<!-- Editable House Number text field (in address block). -->
@@ -955,4 +955,8 @@
<string name="accept">接受</string>
<!-- For the first routing -->
<string name="decline">拒絕</string>
+ <string name="whats_new_route_profile_title">與其長年勞而無功,不如奮起振作</string>
+ <string name="whats_new_route_profile_message">對於行人和自行車路線,我們現在顯示海拔剖面圖。</string>
+ <string name="whats_new_booking_improve_title">優惠預訂飯店</string>
+ <string name="whats_new_booking_improve_message">飯店搜尋結果現在還包含價格類別。\n我們還加入了超過 110,000 間飯店。</string>
</resources>
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 @@
<string name="place_name">地点名</string>
<!-- title above languages list cells in the editor, below editable name text field. -->
<string name="other_languages">其他语言</string>
+ <!-- small button to open list with names in different languages -->
+ <string name="show_more">显示更多</string>
+ <!-- small button to close list with names in different languages -->
+ <string name="show_less">显示更少</string>
<string name="add_language">添加语言</string>
<string name="street">街道</string>
<!-- Editable House Number text field (in address block). -->
@@ -945,4 +949,8 @@
<string name="accept">接受</string>
<!-- For the first routing -->
<string name="decline">拒绝</string>
+ <string name="whats_new_route_profile_title">与其循规蹈矩,不如奋起改变</string>
+ <string name="whats_new_route_profile_message">对于行人和自行车路线,我们现在显示纵剖面。</string>
+ <string name="whats_new_booking_improve_title">优惠预订酒店</string>
+ <string name="whats_new_booking_improve_message">酒店的搜索结果现在包含价格类别。\n我们还添加了超过 110,000 家酒店。</string>
</resources>
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 @@
<!-- What's new -->
<integer-array name="news_images">
- <item>@drawable/img_whatsnew_car_navigation</item>
- <item>@drawable/img_whatsnew_cycle_navigation_improved</item>
- <item>@drawable/img_whatsnew_booking_improved</item>
+ <item>@drawable/ic_img_whatsnew_route_profile</item>
+ <item>@drawable/ic_img_whatsnew_booking_improve</item>
</integer-array>
<string-array name="news_titles">
- <item>@string/whatsnew_car_navigation_header</item>
- <item>@string/whatsnew_cycle_navigation_2_header</item>
- <item>@string/whatsnew_booking_2_header</item>
+ <item>@string/whats_new_route_profile_title</item>
+ <item>@string/whats_new_booking_improve_title</item>
</string-array>
<string-array name="news_messages_1">
- <item>@string/whatsnew_car_navigation_message</item>
- <item>@string/whatsnew_cycle_navigation_2_message</item>
- <item>@string/whatsnew_booking_2_message</item>
+ <item>@string/whats_new_route_profile_message</item>
+ <item>@string/whats_new_booking_improve_message</item>
</string-array>
<string-array name="news_messages_2">
<item/>
<item/>
- <item/>
</string-array>
<string-array name="news_switch_titles">
<item/>
<item/>
- <item/>
</string-array>
<string-array name="news_switch_subtitles">
<item/>
<item/>
- <item/>
</string-array>
</resources>
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 @@
<!-- Altitude chart -->
<dimen name="altitude_chart_container_padding_left">16dp</dimen>
+ <dimen name="altitude_chart_container_padding_bottom">10dp</dimen>
<dimen name="altitude_chart_margin_bottom">4dp</dimen>
<dimen name="altitude_chart_margin_top">14dp</dimen>
<dimen name="altitude_chart_time_distance_height">20dp</dimen>
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 @@
<string name="accept">Accept</string>
<!-- For the first routing -->
<string name="decline">Decline</string>
+ <string name="whats_new_route_profile_title">Better go about than fall into the ditch</string>
+ <string name="whats_new_route_profile_message">For pedestrian and bike routes we now display the elevation profile.</string>
+ <string name="whats_new_booking_improve_title">Save when booking hotels</string>
+ <string name="whats_new_booking_improve_message">Search results for hotels now contain the price category.\nWe also added more than 110,000 hotels.</string>
</resources>
diff --git a/android/res/values/styles-text.xml b/android/res/values/styles-text.xml
index 8b965b7109..fc7ebe23a0 100644
--- a/android/res/values/styles-text.xml
+++ b/android/res/values/styles-text.xml
@@ -106,17 +106,16 @@
<item name="android:textStyle">bold</item>
</style>
+ <style name="MwmTextAppearance.RoutingNumber.Navigation">
+ <item name="android:textSize">@dimen/text_size_nav_number</item>
+ </style>
+
<style name="MwmTextAppearance.RoutingDimension">
<item name="android:textSize">@dimen/text_size_routing_dimension</item>
<item name="android:textColor">?android:textColorSecondary</item>
<item name="android:textStyle">bold</item>
</style>
- <style name="MwmTextAppearance.RoutingDimension.Inline"
- parent="MwmTextAppearance.RoutingNumber">
- <item name="android:textSize">@dimen/text_size_routing_dimension_inline</item>
- </style>
-
<style name="MwmTextAppearance.RoutingDetail">
<item name="android:textSize">@dimen/text_size_routing_plan_detail</item>
<item name="android:fontFamily" tools:ignore="NewApi">@string/robotoMedium</item>
diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java
index e029ccc90b..566bf3d4e9 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
{
@@ -212,20 +212,24 @@ public class DownloadResourcesActivity extends BaseMwmFragmentActivity
protected void onCreate(Bundle savedInstanceState)
{
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();
+
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..027f1ccaa1 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
{
@@ -183,6 +180,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
runTasks();
}
+ @Override
+ public void onRenderingRestored()
+ {
+ runTasks();
+ }
+
private void runTasks()
{
while (!mTasks.isEmpty())
@@ -669,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);
}
@@ -714,7 +724,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 +735,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 +1157,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);
@@ -1285,7 +1297,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
|| RoutingController.get().isErrorEncountered())
{
mMainMenu.showLineFrame(false);
+ return;
}
+
+ mMainMenu.showLineFrame(true);
}
@Override
diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java
index d59f48c5b7..a877bfc8a4 100644
--- a/android/src/com/mapswithme/maps/MwmApplication.java
+++ b/android/src/com/mapswithme/maps/MwmApplication.java
@@ -33,6 +33,8 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.PushwooshHelper;
import com.mapswithme.util.statistics.Statistics;
+import com.my.tracker.MyTracker;
+import com.my.tracker.MyTrackerParams;
import com.pushwoosh.PushManager;
import io.fabric.sdk.android.Fabric;
import net.hockeyapp.android.CrashManager;
@@ -105,22 +107,29 @@ 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();
String settingsPath = getSettingsPath();
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();
@@ -186,8 +195,18 @@ public class MwmApplication extends Application
Fabric.with(this, new Crashlytics(), new CrashlyticsNdk());
nativeInitCrashlytics();
+ }
- Crashlytics.setString("AlohalyticsInstallationId", Utils.getInstallationId());
+ private static boolean setInstallationIdToCrashlytics()
+ {
+ final String installationId = Utils.getInstallationId();
+ // 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;
+
+ Crashlytics.setString("AlohalyticsInstallationId", installationId);
+ return true;
}
public boolean isFrameworkInitialized()
@@ -287,6 +306,15 @@ public class MwmApplication extends Application
}
}
+ private void initTracker()
+ {
+ MyTracker.setDebugMode(BuildConfig.DEBUG);
+ MyTracker.createTracker(PrivateVariables.myTrackerKey(), this);
+ final MyTrackerParams myParams = MyTracker.getTrackerParams();
+ myParams.setDefaultVendorAppPackage();
+ MyTracker.initTracker();
+ }
+
public void initCounters()
{
if (!mAreCountersInitialized)
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/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()
{
@@ -92,6 +95,19 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
}
@Override
+ protected void onRestoreInstanceState(Bundle savedInstanceState)
+ {
+ super.onRestoreInstanceState(savedInstanceState);
+ mSavedInstanceState = savedInstanceState;
+ }
+
+ @Nullable
+ public Bundle getSavedInstanceState()
+ {
+ return mSavedInstanceState;
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item)
{
if (item.getItemId() == android.R.id.home)
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/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java
index ef45818031..1355a78d6f 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,52 @@ public class EditorHostFragment extends BaseMwmToolbarFragment
if (note.length() != 0)
Editor.nativeCreateNote(note);
// Save object edits
- if (Editor.nativeSaveEditedFeature())
+ if (!MwmApplication.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.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 +338,24 @@ 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);
diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java
index 2327612928..468aa9f765 100644
--- a/android/src/com/mapswithme/maps/location/TrackRecorder.java
+++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java
@@ -8,11 +8,15 @@ import android.content.Intent;
import android.location.Location;
import android.os.Environment;
import android.os.SystemClock;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.Log;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.background.AppBackgroundTracker;
import com.mapswithme.util.Constants;
+import com.mapswithme.util.StorageUtils;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.log.FileLogger;
import com.mapswithme.util.log.Logger;
@@ -38,6 +42,7 @@ public final class TrackRecorder
};
private static Boolean sEnableLogging;
+ @Nullable
private static Logger sLogger;
private static final LocationListener sLocationListener = new LocationListener.Simple()
@@ -205,7 +210,6 @@ public final class TrackRecorder
});
}
- @SuppressLint("SdCardPath")
static void log(String message)
{
if (sEnableLogging == null)
@@ -217,10 +221,15 @@ public final class TrackRecorder
synchronized (TrackRecorder.class)
{
if (sLogger == null)
- sLogger = new FileLogger(Environment.getExternalStorageDirectory().getAbsolutePath() + Constants.MWM_DIR_POSTFIX + "/gps-tracker.log");
+ {
+ String externalDir = StorageUtils.getExternalFilesDir();
+ if (!TextUtils.isEmpty(externalDir))
+ sLogger = new FileLogger(externalDir + "/gps-tracker.log");
+ }
+ }
+ if (sLogger != null)
sLogger.d(message);
- }
}
private static native void nativeSetEnabled(boolean enable);
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();
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);
}
-
}
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)
diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java
index 81e3f987be..d780a1d24e 100644
--- a/android/src/com/mapswithme/maps/widget/ToolbarController.java
+++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java
@@ -44,7 +44,8 @@ public class ToolbarController
}
}
- protected @IdRes int getToolbarId()
+ @IdRes
+ private int getToolbarId()
{
return R.id.toolbar;
}
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/StorageUtils.java b/android/src/com/mapswithme/util/StorageUtils.java
new file mode 100644
index 0000000000..0664c8cac3
--- /dev/null
+++ b/android/src/com/mapswithme/util/StorageUtils.java
@@ -0,0 +1,47 @@
+package com.mapswithme.util;
+
+import android.content.Context;
+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;
+
+import java.io.File;
+
+public class StorageUtils
+{
+ /**
+ * Checks if external storage is available for read and write
+ *
+ * @return true if external storage is mounted and ready for reading/writing
+ */
+ private static boolean isExternalStorageWritable()
+ {
+ String state = Environment.getExternalStorageState();
+ return Environment.MEDIA_MOUNTED.equals(state);
+ }
+
+ /**
+ * Safely returns the external files directory path with the preliminary
+ * checking the availability of the mentioned directory
+ *
+ * @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()
+ {
+ 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;
+ }
+}
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(), "");
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);
}
}
diff --git a/data/World.mwm b/data/World.mwm
index dada9edf08..d238d0db77 100644
--- a/data/World.mwm
+++ b/data/World.mwm
Binary files differ
diff --git a/data/WorldCoasts.mwm b/data/WorldCoasts.mwm
index d7b9853764..67b1e98a32 100644
--- a/data/WorldCoasts.mwm
+++ b/data/WorldCoasts.mwm
Binary files 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
diff --git a/data/languages.txt b/data/languages.txt
index a5de9d6087..4dfafb9284 100644
--- a/data/languages.txt
+++ b/data/languages.txt
@@ -1,4 +1,4 @@
-default|Native for each country
+default|Native for the country
en|English
ja|日本語
fr|Français
diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp
index 94a9f16654..a93ba86fda 100644
--- a/drape_frontend/backend_renderer.cpp
+++ b/drape_frontend/backend_renderer.cpp
@@ -242,19 +242,19 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
{
ref_ptr<AddRouteMessage> msg = message;
m_routeBuilder->Build(msg->GetRoutePolyline(), msg->GetTurns(),
- msg->GetColor(), msg->GetPattern(), m_texMng);
+ msg->GetColor(), msg->GetPattern(), m_texMng, msg->GetRecacheId());
break;
}
case Message::CacheRouteSign:
{
ref_ptr<CacheRouteSignMessage> 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->GetRecacheId());
break;
}
case Message::CacheRouteArrows:
{
ref_ptr<CacheRouteArrowsMessage> msg = message;
- m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng);
+ m_routeBuilder->BuildArrows(msg->GetRouteIndex(), msg->GetBorders(), m_texMng, msg->GetRecacheId());
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> message)
{
ref_ptr<FlushRouteMessage> msg = message;
drape_ptr<RouteData> 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> message)
{
ref_ptr<FlushRouteSignMessage> msg = message;
drape_ptr<RouteSignData> 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> message)
{
ref_ptr<FlushRouteArrowsMessage> msg = message;
drape_ptr<RouteArrowsData> 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> message)
{
ref_ptr<RemoveRouteMessage> msg = message;
m_routeRenderer->Clear();
+ ++m_lastRecacheRouteId;
if (msg->NeedDeactivateFollowing())
{
m_myPositionController->DeactivateRouting();
@@ -724,13 +737,15 @@ unique_ptr<threads::IRoutine> 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<CacheRouteSignMessage>(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<CacheRouteSignMessage>(position, false /* isStart */,
- true /* isValid */),
+ true /* isValid */, m_lastRecacheRouteId),
MessagePriority::High);
}
@@ -749,7 +764,8 @@ void FrontendRenderer::UpdateGLResources()
auto recacheRouteMsg = make_unique_dp<AddRouteMessage>(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/gps_track_renderer.cpp b/drape_frontend/gps_track_renderer.cpp
index 6dfe0a692b..def40a6c10 100644
--- a/drape_frontend/gps_track_renderer.cpp
+++ b/drape_frontend/gps_track_renderer.cpp
@@ -95,7 +95,9 @@ void GpsTrackRenderer::AddRenderData(ref_ptr<dp::GpuProgramManager> mng,
void GpsTrackRenderer::ClearRenderData()
{
m_renderData.clear();
+ m_handlesCache.clear();
m_waitForRenderData = false;
+ m_needUpdate = true;
}
void GpsTrackRenderer::UpdatePoints(vector<GpsTrackPoint> const & toAdd, vector<uint32_t> const & toRemove)
diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp
index e2263ee5fa..67ad21e1f1 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<double> const & turns,
df::ColorConstant color, df::RoutePattern const & pattern)
+ : AddRouteMessage(routePolyline, turns, color, pattern, -1 /* invalid recache id */)
+ {}
+
+ AddRouteMessage(m2::PolylineD const & routePolyline, vector<double> 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<double> const & GetTurns() const { return m_turns; }
df::RoutePattern const & GetPattern() const { return m_pattern; }
+ int GetRecacheId() const { return m_recacheId; }
private:
m2::PolylineD m_routePolyline;
df::ColorConstant m_color;
vector<double> 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 GetRecacheId() 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<ArrowBorders> const & borders)
+ : CacheRouteArrowsMessage(routeIndex, borders, -1 /* invalid recache id */)
+ {}
+
+ CacheRouteArrowsMessage(int routeIndex, vector<ArrowBorders> 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<ArrowBorders> const & GetBorders() const { return m_borders; }
+ int GetRecacheId() const { return m_recacheId; }
private:
int m_routeIndex;
vector<ArrowBorders> 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<double> const & turns,
df::ColorConstant color, df::RoutePattern const & pattern,
- ref_ptr<dp::TextureManager> textures)
+ ref_ptr<dp::TextureManager> textures, int recacheId)
{
drape_ptr<RouteData> routeData = make_unique_dp<RouteData>();
routeData->m_routeIndex = m_routeIndex++;
@@ -24,6 +24,7 @@ void RouteBuilder::Build(m2::PolylineD const & routePolyline, vector<double> 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<dp::TextureManager> textures)
+ ref_ptr<dp::TextureManager> textures, int recacheId)
{
drape_ptr<RouteSignData> routeSignData = make_unique_dp<RouteSignData>();
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<ArrowBorders> const & borders,
- ref_ptr<dp::TextureManager> textures)
+ ref_ptr<dp::TextureManager> textures, int recacheId)
{
auto it = m_routeCache.find(routeIndex);
if (it == m_routeCache.end())
@@ -65,6 +67,7 @@ void RouteBuilder::BuildArrows(int routeIndex, vector<ArrowBorders> const & bord
drape_ptr<RouteArrowsData> routeArrowsData = make_unique_dp<RouteArrowsData>();
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<double> const & turns,
df::ColorConstant color, df::RoutePattern const & pattern,
- ref_ptr<dp::TextureManager> textures);
+ ref_ptr<dp::TextureManager> textures, int recacheId);
void BuildArrows(int routeIndex, vector<ArrowBorders> const & borders,
- ref_ptr<dp::TextureManager> textures);
+ ref_ptr<dp::TextureManager> textures, int recacheId);
void BuildSign(m2::PointD const & pos, bool isStart, bool isValid,
- ref_ptr<dp::TextureManager> textures);
+ ref_ptr<dp::TextureManager> 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
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
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")
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 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMBottomMenuViewController">
@@ -32,11 +33,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kbJ-If-gUR" userLabel="MainButtons">
- <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IzQ-aQ-aPH" userLabel="Search" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="60" height="48"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="searchButton"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="J9X-GZ-6tZ"/>
@@ -50,8 +49,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQ0-ZK-UXk" userLabel="P2P" customClass="MWMButton">
- <rect key="frame" x="88" y="0.0" width="60" height="48"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="p2pButton"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="paN-sx-04o"/>
@@ -65,8 +63,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qVh-dm-DDH" userLabel="Bookmarks" customClass="MWMButton">
- <rect key="frame" x="176" y="0.0" width="60" height="48"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="bookmarksButton"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="EmN-5v-BhH"/>
@@ -80,22 +77,17 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c75-ZF-hKn">
- <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="33 мин • 7.0 км" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EQy-vz-gyi">
- <rect key="frame" x="16" y="14" width="122" height="21"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="600" text="33 мин • 7.0 км" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EQy-vz-gyi">
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Xc-Kl-hAm">
- <rect key="frame" x="154" y="12" width="54" height="24"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="150" verticalHuggingPriority="150" horizontalCompressionResistancePriority="240" verticalCompressionResistancePriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="ViI-p6-hUf">
- <rect key="frame" x="0.0" y="0.0" width="54" height="24"/>
- </imageView>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="150" verticalHuggingPriority="150" horizontalCompressionResistancePriority="240" verticalCompressionResistancePriority="240" translatesAutoresizingMaskIntoConstraints="NO" id="ViI-p6-hUf"/>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="ViI-p6-hUf" firstAttribute="leading" secondItem="4Xc-Kl-hAm" secondAttribute="leading" id="4Rl-3k-ej1"/>
<constraint firstAttribute="bottom" secondItem="ViI-p6-hUf" secondAttribute="bottom" id="YtA-RO-fmc"/>
@@ -103,8 +95,35 @@
<constraint firstAttribute="trailing" secondItem="ViI-p6-hUf" secondAttribute="trailing" id="tnv-Fq-At9"/>
</constraints>
</view>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nD5-wx-7Ui">
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_elevation" translatesAutoresizingMaskIntoConstraints="NO" id="FpX-u9-FuR">
+ <constraints>
+ <constraint firstAttribute="height" constant="12" id="Wup-Xg-5Ce"/>
+ <constraint firstAttribute="width" constant="10" id="rVv-JG-SyM"/>
+ </constraints>
+ </imageView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="270" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dVz-cc-LUM">
+ <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+ </userDefinedRuntimeAttributes>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="FpX-u9-FuR" firstAttribute="leading" secondItem="nD5-wx-7Ui" secondAttribute="leading" id="2as-BP-0az"/>
+ <constraint firstItem="dVz-cc-LUM" firstAttribute="leading" secondItem="FpX-u9-FuR" secondAttribute="trailing" constant="4" id="Nhd-Y8-dTQ"/>
+ <constraint firstAttribute="trailing" secondItem="dVz-cc-LUM" secondAttribute="trailing" id="QIw-po-XUM"/>
+ <constraint firstAttribute="bottom" secondItem="FpX-u9-FuR" secondAttribute="bottom" id="a6A-3c-6yL"/>
+ <constraint firstItem="FpX-u9-FuR" firstAttribute="top" secondItem="nD5-wx-7Ui" secondAttribute="top" id="lus-SX-O0h"/>
+ <constraint firstItem="dVz-cc-LUM" firstAttribute="centerY" secondItem="FpX-u9-FuR" secondAttribute="centerY" id="yEP-oH-4ti"/>
+ </constraints>
+ </view>
<button hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pLD-sZ-ejH" userLabel="Go" customClass="MWMStartButton">
- <rect key="frame" x="224" y="0.0" width="96" height="48"/>
<accessibility key="accessibilityConfiguration" identifier="goButton"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="ZHw-Ha-INX"/>
@@ -112,7 +131,7 @@
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
<state key="normal" title="Start"/>
<state key="selected">
- <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
+ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -126,34 +145,30 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UhW-en-7qq">
- <rect key="frame" x="0.0" y="0.0" width="72" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="azs-RS-4KE">
- <rect key="frame" x="36" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y2P-la-daO">
- <rect key="frame" x="36" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P9v-a6-EaA">
- <rect key="frame" x="36" y="11" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Y2P-la-daO" firstAttribute="centerX" secondItem="UhW-en-7qq" secondAttribute="centerX" priority="750" id="88p-qa-uC4"/>
<constraint firstItem="Y2P-la-daO" firstAttribute="top" secondItem="UhW-en-7qq" secondAttribute="top" constant="4" id="MZ8-us-Rv7"/>
@@ -166,25 +181,22 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z68-6z-5Ph">
- <rect key="frame" x="104" y="0.0" width="112" height="48"/>
<subviews>
<pageControl opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="100" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="2" translatesAutoresizingMaskIntoConstraints="NO" id="7hO-Gk-BGJ">
- <rect key="frame" x="44" y="4" width="23" height="13"/>
<constraints>
<constraint firstAttribute="height" constant="13" id="a7i-03-Hg1"/>
</constraints>
</pageControl>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jSU-Ns-SpQ">
- <rect key="frame" x="56" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="jSU-Ns-SpQ" firstAttribute="centerX" secondItem="Z68-6z-5Ph" secondAttribute="centerX" id="DKb-2f-om1"/>
<constraint firstAttribute="width" constant="112" id="GYP-RF-12U"/>
@@ -194,34 +206,30 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mab-rl-ueg">
- <rect key="frame" x="248" y="0.0" width="72" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LOZ-cm-r9V">
- <rect key="frame" x="36" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBZ-kD-25J">
- <rect key="frame" x="36" y="4" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ad-tg-al9">
- <rect key="frame" x="36" y="11" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="LBZ-kD-25J" firstAttribute="top" secondItem="mab-rl-ueg" secondAttribute="top" constant="4" id="LHZ-Zi-oiI"/>
<constraint firstItem="5ad-tg-al9" firstAttribute="centerX" secondItem="mab-rl-ueg" secondAttribute="centerX" id="Np5-b9-h9o"/>
@@ -233,11 +241,9 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qvF-jY-5Gi">
- <rect key="frame" x="0.0" y="44" width="320" height="4"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xqD-Zl-BRc">
- <rect key="frame" x="0.0" y="0.0" width="0.0" height="4"/>
- <color key="backgroundColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" id="pSf-au-FVR"/>
</constraints>
@@ -246,7 +252,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="xqD-Zl-BRc" secondAttribute="bottom" id="4PZ-NH-ZvR"/>
<constraint firstItem="xqD-Zl-BRc" firstAttribute="leading" secondItem="qvF-jY-5Gi" secondAttribute="leading" id="Mfi-1F-Szz"/>
@@ -255,14 +261,13 @@
</constraints>
</view>
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3oJ-Rv-JS7" userLabel="ToggleInfo">
- <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<action selector="toggleInfoTouchUpInside" destination="-1" eventType="touchUpInside" id="kuP-Ue-Syq"/>
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="3oJ-Rv-JS7" secondAttribute="trailing" id="3R5-Ud-LdZ"/>
<constraint firstItem="mab-rl-ueg" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" id="3xv-Y2-YLW"/>
@@ -270,6 +275,7 @@
<constraint firstItem="5ad-tg-al9" firstAttribute="centerY" secondItem="7hO-Gk-BGJ" secondAttribute="centerY" priority="500" id="6Q9-vO-V4W"/>
<constraint firstItem="Z68-6z-5Ph" firstAttribute="centerX" secondItem="c75-ZF-hKn" secondAttribute="centerX" id="AcE-Sk-hhd"/>
<constraint firstAttribute="bottom" secondItem="Z68-6z-5Ph" secondAttribute="bottom" id="BlR-TS-xJa"/>
+ <constraint firstItem="nD5-wx-7Ui" firstAttribute="trailing" secondItem="4Xc-Kl-hAm" secondAttribute="trailing" priority="250" id="CRC-g9-WLM"/>
<constraint firstAttribute="trailing" secondItem="pLD-sZ-ejH" secondAttribute="trailing" id="E7k-Dh-qE5"/>
<constraint firstAttribute="bottom" secondItem="4Xc-Kl-hAm" secondAttribute="bottom" constant="12" id="IBg-Su-7fT"/>
<constraint firstAttribute="bottom" secondItem="3oJ-Rv-JS7" secondAttribute="bottom" id="QSK-8y-lMm"/>
@@ -283,21 +289,23 @@
<constraint firstItem="UhW-en-7qq" firstAttribute="leading" secondItem="c75-ZF-hKn" secondAttribute="leading" id="ZCC-xJ-5Vg"/>
<constraint firstItem="4Xc-Kl-hAm" firstAttribute="top" secondItem="EQy-vz-gyi" secondAttribute="bottom" priority="250" constant="8" id="ZCb-We-WNy"/>
<constraint firstItem="EQy-vz-gyi" firstAttribute="centerY" secondItem="c75-ZF-hKn" secondAttribute="centerY" priority="500" id="ZKG-5z-sra"/>
+ <constraint firstItem="nD5-wx-7Ui" firstAttribute="leading" secondItem="EQy-vz-gyi" secondAttribute="leading" priority="260" id="b4o-Ke-eqq"/>
<constraint firstItem="Z68-6z-5Ph" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" id="cpY-Wy-lyr"/>
<constraint firstItem="EQy-vz-gyi" firstAttribute="leading" secondItem="c75-ZF-hKn" secondAttribute="leading" constant="16" id="fIE-wa-hE8"/>
- <constraint firstItem="EQy-vz-gyi" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" priority="250" constant="14" id="fOa-qL-A5d"/>
+ <constraint firstItem="EQy-vz-gyi" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" priority="250" constant="12" id="fOa-qL-A5d"/>
<constraint firstItem="pLD-sZ-ejH" firstAttribute="leading" secondItem="4Xc-Kl-hAm" secondAttribute="trailing" constant="16" id="h3c-E6-aX6"/>
+ <constraint firstItem="nD5-wx-7Ui" firstAttribute="centerY" secondItem="EQy-vz-gyi" secondAttribute="centerY" priority="250" id="h5a-LJ-T8H"/>
<constraint firstItem="P9v-a6-EaA" firstAttribute="centerY" secondItem="7hO-Gk-BGJ" secondAttribute="centerY" priority="500" id="hEB-H2-4WJ"/>
<constraint firstItem="4Xc-Kl-hAm" firstAttribute="leading" secondItem="c75-ZF-hKn" secondAttribute="leading" priority="250" constant="12" id="mac-YL-Cyx"/>
<constraint firstItem="3oJ-Rv-JS7" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" id="plc-KQ-Bxg"/>
<constraint firstAttribute="bottom" secondItem="UhW-en-7qq" secondAttribute="bottom" id="tF2-H2-VBe"/>
<constraint firstItem="4Xc-Kl-hAm" firstAttribute="top" secondItem="c75-ZF-hKn" secondAttribute="top" priority="500" constant="12" id="vt3-dc-Ngf"/>
<constraint firstAttribute="trailing" secondItem="mab-rl-ueg" secondAttribute="trailing" id="w4c-fR-znA"/>
+ <constraint firstItem="nD5-wx-7Ui" firstAttribute="bottom" secondItem="4Xc-Kl-hAm" secondAttribute="bottom" priority="500" id="wq2-oV-MOH"/>
</constraints>
</view>
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YLY-C4-SBu" userLabel="Menu" customClass="MWMButton">
- <rect key="frame" x="260" y="0.0" width="60" height="48"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="menuButton"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="ams-2s-vhw"/>
@@ -311,8 +319,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WLn-2O-Ivv" userLabel="DownloadBadge">
- <rect key="frame" x="293" y="11" width="10" height="10"/>
- <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="10" id="ToN-Zr-4oh"/>
<constraint firstAttribute="height" constant="10" id="XeO-2q-gDj"/>
@@ -325,7 +332,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="qvF-jY-5Gi" firstAttribute="leading" secondItem="kbJ-If-gUR" secondAttribute="leading" id="4FM-cc-hga"/>
<constraint firstItem="YLY-C4-SBu" firstAttribute="leading" secondItem="c75-ZF-hKn" secondAttribute="trailing" priority="250" id="4e2-YH-he6"/>
@@ -352,8 +359,7 @@
</constraints>
</view>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nYy-JN-hGA" userLabel="Separator">
- <rect key="frame" x="0.0" y="48" width="320" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Kgm-bO-O6Q"/>
</constraints>
@@ -362,8 +368,7 @@
</userDefinedRuntimeAttributes>
</view>
<collectionView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" bouncesZoom="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="hSd-fM-qKd" userLabel="AdditionalButtons">
- <rect key="frame" x="0.0" y="49" width="320" height="148"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="148" id="fsD-HQ-mF9"/>
</constraints>
@@ -374,10 +379,8 @@
</connections>
</collectionView>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z8y-bh-6dN">
- <rect key="frame" x="0.0" y="48" width="320" height="64"/>
<subviews>
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o9v-sB-QHp" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="64" height="64"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="64" id="pvz-bi-FpY"/>
<constraint firstAttribute="width" constant="64" id="q3s-yb-6lU"/>
@@ -391,7 +394,6 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q6M-3k-tKX" customClass="MWMButton">
- <rect key="frame" x="256" y="0.0" width="64" height="64"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="64" id="6Us-Z7-JyL"/>
<constraint firstAttribute="width" constant="64" id="GtG-l1-K05"/>
@@ -406,14 +408,13 @@
</connections>
</button>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kyc-p0-3HI" customClass="MWMStopButton">
- <rect key="frame" x="112" y="14" width="96" height="36"/>
- <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="96" id="aRk-9J-VLI"/>
<constraint firstAttribute="height" priority="750" constant="36" id="vAX-VM-89C"/>
</constraints>
<state key="normal" title="STOP">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -430,7 +431,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="q6M-3k-tKX" secondAttribute="trailing" id="1Zb-qW-cfl"/>
<constraint firstAttribute="height" constant="64" id="7YS-h4-f40"/>
@@ -442,7 +443,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="hSd-fM-qKd" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="2jm-k3-CLB"/>
<constraint firstItem="kbJ-If-gUR" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="7id-li-IXL"/>
@@ -470,11 +471,14 @@
<outlet property="distanceView" destination="mab-rl-ueg" id="wnH-29-JDU"/>
<outlet property="distanceWithLegendLabel" destination="LOZ-cm-r9V" id="Cdx-SJ-kAY"/>
<outlet property="downloadBadge" destination="WLn-2O-Ivv" id="f9u-k6-l9u"/>
+ <outlet property="elevationHeight" destination="dVz-cc-LUM" id="kBh-29-6zr"/>
+ <outlet property="elevationImage" destination="FpX-u9-FuR" id="j3J-NH-eKH"/>
<outlet property="estimateLabel" destination="EQy-vz-gyi" id="lVV-FW-8AJ"/>
<outlet property="estimateLabelTopOffset" destination="fOa-qL-A5d" id="7eJ-Go-MBm"/>
<outlet property="goButton" destination="pLD-sZ-ejH" id="Txw-4S-mwR"/>
<outlet property="goButtonWidth" destination="ZHw-Ha-INX" id="H3K-lh-Iyx"/>
<outlet property="heightProfileContainer" destination="4Xc-Kl-hAm" id="ovY-lT-vrD"/>
+ <outlet property="heightProfileElevation" destination="nD5-wx-7Ui" id="DBa-gs-tSc"/>
<outlet property="heightProfileImage" destination="ViI-p6-hUf" id="8b8-rT-Hpc"/>
<outlet property="mainButtons" destination="kbJ-If-gUR" id="1sk-bi-6xl"/>
<outlet property="mainButtonsHeight" destination="HtR-j8-Qpc" id="eF8-KH-F9n"/>
@@ -507,10 +511,13 @@
<outletCollection property="speedDistanceOffset" destination="w4c-fR-znA" id="q0p-e4-syx"/>
<outletCollection property="heightProfileContainerVerticalOrientation" destination="mac-YL-Cyx" id="L7C-H0-A6R"/>
<outletCollection property="heightProfileContainerVerticalOrientation" destination="ZCb-We-WNy" id="uzJ-Eb-Epe"/>
+ <outletCollection property="heightProfileContainerVerticalOrientation" destination="CRC-g9-WLM" id="Zr9-y7-E9U"/>
+ <outletCollection property="heightProfileContainerVerticalOrientation" destination="h5a-LJ-T8H" id="89A-IH-XBE"/>
</connections>
</view>
</objects>
<resources>
+ <image name="ic_elevation" width="10" height="12"/>
<image name="ic_menu" width="48" height="48"/>
<image name="ic_menu_bookmark_list" width="48" height="48"/>
<image name="ic_menu_point_to_point" width="48" height="48"/>
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/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
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<TMWMWelcomeConfigBlock> * 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<TMWMWelcomeConfigBlock> *)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 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies>
<deployment version="2048" identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
- <mutableArray key="HelveticaNeue.ttc">
+ <array key="HelveticaNeue.ttc">
<string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- </mutableArray>
+ </array>
</customFonts>
<scenes>
<!--Whats New Night Mode Controller-->
@@ -26,20 +22,16 @@
<viewControllerLayoutGuide type="bottom" id="jfD-hq-SOU"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="7pp-pP-9ZU" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Aly-IM-2KF" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jh4-I1-edQ" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KYa-do-R0L" userLabel="CenteredView">
- <rect key="frame" x="44" y="59" width="400" height="337"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="9EX-CE-PRs">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="Vf0-P1-t3t"/>
<constraint firstAttribute="width" secondItem="9EX-CE-PRs" secondAttribute="height" multiplier="1:1" id="pgq-ox-chU"/>
@@ -47,9 +39,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="geS-K2-Efv" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="48"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -57,9 +48,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мы разделили большие карты на части. И теперь они будут быстрее загружаться. Попробуйте." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cK0-L8-zCK" userLabel="Text">
- <rect key="frame" x="0.0" y="304" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -67,7 +57,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="4o0-Yx-Cbo"/>
@@ -84,7 +74,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="KYa-do-R0L" secondAttribute="trailing" priority="999" id="01i-JX-qNi"/>
@@ -95,16 +85,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D1s-fA-Vvv" userLabel="NotNow">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="2yq-4Q-fEn"/>
<constraint firstAttribute="height" constant="44" id="Jir-CF-Nzd"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -122,7 +111,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="D1s-fA-Vvv" secondAttribute="bottom" constant="40" id="5x8-vK-Ldc"/>
<constraint firstItem="9EX-CE-PRs" firstAttribute="height" secondItem="Aly-IM-2KF" secondAttribute="height" multiplier="0.3" priority="750" id="Ox3-ge-rJ4"/>
@@ -179,20 +168,16 @@
<viewControllerLayoutGuide type="bottom" id="f75-9I-74y"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="RNH-dF-vbJ" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x7d-CC-QbG" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X71-ep-Kwb" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y7O-d8-Zqv" userLabel="CenteredView">
- <rect key="frame" x="44" y="59" width="400" height="337"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="3yX-3O-NmI">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="0jq-yV-Ew3"/>
<constraint firstAttribute="width" secondItem="3yX-3O-NmI" secondAttribute="height" multiplier="1:1" id="OJT-CV-liK"/>
@@ -200,9 +185,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbU-5I-7cc" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="48"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -210,9 +194,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мы разделили большие карты на части. И теперь они будут быстрее загружаться. Попробуйте." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qXz-kN-Ik2" userLabel="Text">
- <rect key="frame" x="0.0" y="304" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -220,7 +203,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="7na-4a-yyW"/>
@@ -237,7 +220,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="y7O-d8-Zqv" firstAttribute="height" relation="lessThanOrEqual" secondItem="X71-ep-Kwb" secondAttribute="height" id="0hu-C0-WoD"/>
@@ -248,16 +231,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UqX-Ni-ms1" userLabel="NotNow">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="66G-KS-XdJ"/>
<constraint firstAttribute="height" constant="44" id="iFJ-VB-wRd"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -271,7 +253,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="3yX-3O-NmI" firstAttribute="height" secondItem="x7d-CC-QbG" secondAttribute="height" multiplier="0.3" priority="750" id="1bZ-xW-y9r"/>
<constraint firstAttribute="width" constant="520" id="7CX-xf-4jo"/>
@@ -320,20 +302,16 @@
<viewControllerLayoutGuide type="bottom" id="ZGH-fX-kmZ"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="oVB-IG-dvL" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yss-Sh-6Az" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x7x-NE-mqP" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3e1-HO-MaJ" userLabel="CenteredView">
- <rect key="frame" x="44" y="59" width="400" height="337"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="mm5-FP-Hug">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="bky-HI-LEh"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="dic-5i-JP2"/>
@@ -341,9 +319,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9lh-sL-HGk" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="48"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -351,9 +328,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мы разделили большие карты на части. И теперь они будут быстрее загружаться. Попробуйте." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FYP-Wb-Mbo" userLabel="Text">
- <rect key="frame" x="0.0" y="304" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -361,7 +337,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="FYP-Wb-Mbo" firstAttribute="top" secondItem="9lh-sL-HGk" secondAttribute="bottom" constant="16" id="0Q8-gv-OIt"/>
@@ -378,7 +354,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="3e1-HO-MaJ" firstAttribute="centerY" secondItem="x7x-NE-mqP" secondAttribute="centerY" id="4Mm-5L-pn2"/>
@@ -389,16 +365,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lkc-EG-p2i" userLabel="NotNow">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="GGc-uG-5F4"/>
<constraint firstAttribute="width" constant="240" id="jn3-7K-EtC"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -412,7 +387,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="lkc-EG-p2i" secondAttribute="bottom" constant="40" id="2nR-yP-ini"/>
<constraint firstItem="x7x-NE-mqP" firstAttribute="top" secondItem="yss-Sh-6Az" secondAttribute="top" constant="40" id="3Re-Fs-3VQ"/>
@@ -461,20 +436,16 @@
<viewControllerLayoutGuide type="bottom" id="gVU-zj-hS0"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="3Yj-pM-DlR" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rBz-ID-Sy9" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BrI-By-UIb" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="396"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Gz-UC-6ew" userLabel="CenteredView">
- <rect key="frame" x="44" y="29" width="400" height="337"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="eWf-84-GDx">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="148" id="OXy-WB-moM"/>
<constraint firstAttribute="width" secondItem="eWf-84-GDx" secondAttribute="height" multiplier="1:1" id="fOX-NS-jxP"/>
@@ -482,9 +453,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAPS.ME подскажет куда поворачивать" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="96w-J9-bFX" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="48"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -492,9 +462,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мы разделили большие карты на части. И теперь они будут быстрее загружаться. Попробуйте." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gsi-YU-atq" userLabel="Text">
- <rect key="frame" x="0.0" y="304" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -502,7 +471,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="eWf-84-GDx" firstAttribute="top" secondItem="0Gz-UC-6ew" secondAttribute="top" id="60o-zd-ZuM"/>
@@ -519,7 +488,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="0Gz-UC-6ew" secondAttribute="trailing" priority="999" id="HLH-DL-CaP"/>
@@ -530,16 +499,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qHU-Xd-EGJ">
- <rect key="frame" x="140" y="456" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="YCf-8M-mYT"/>
<constraint firstAttribute="height" constant="44" id="pyV-xm-J00"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Primary Button">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -553,16 +521,15 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4A6-uZ-BH2">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="ftd-8e-0Zy"/>
<constraint firstAttribute="width" constant="240" id="p6M-gw-U3P"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="SecondaryButton">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -571,7 +538,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="4A6-uZ-BH2" firstAttribute="top" secondItem="qHU-Xd-EGJ" secondAttribute="bottom" priority="950" constant="16" id="0WY-iW-bMe"/>
<constraint firstAttribute="width" constant="520" id="Efn-mX-d9a"/>
@@ -633,20 +600,16 @@
<viewControllerLayoutGuide type="bottom" id="G04-nM-BBb"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="ieA-8N-47A" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Lu-4U-pEI" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kj0-gQ-Qse" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JYu-ab-gCF" userLabel="CenteredView">
- <rect key="frame" x="44" y="71" width="400" height="313"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="Rmo-sR-xof">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="width" secondItem="Rmo-sR-xof" secondAttribute="height" multiplier="1:1" id="29n-nP-gF1"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="SVq-tV-14M"/>
@@ -654,9 +617,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Бронируй отель из приложения" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rkh-Km-3rn" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -664,9 +626,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="При выборе отелей на карте будут отображаться ценовая категория и рейтинг заведения." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tnj-ab-WNV" userLabel="Text">
- <rect key="frame" x="0.0" y="280" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -674,7 +635,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="rkh-Km-3rn" firstAttribute="width" secondItem="JYu-ab-gCF" secondAttribute="width" id="0a4-d1-maV"/>
@@ -691,7 +652,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="JYu-ab-gCF" firstAttribute="leading" secondItem="Kj0-gQ-Qse" secondAttribute="leading" priority="999" id="9FF-PA-D8J"/>
@@ -702,16 +663,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GIi-E6-KZS" userLabel="NotNow">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="OJi-1g-t3j"/>
<constraint firstAttribute="height" constant="44" id="Qrh-dE-IE7"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -725,7 +685,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="GIi-E6-KZS" firstAttribute="top" secondItem="Kj0-gQ-Qse" secondAttribute="bottom" constant="20" id="Avw-5R-pyb"/>
<constraint firstItem="Kj0-gQ-Qse" firstAttribute="leading" secondItem="6Lu-4U-pEI" secondAttribute="leading" constant="16" id="GZu-4x-w0N"/>
@@ -739,12 +699,11 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="It2-Pc-pmy">
- <rect key="frame" x="556" y="32" width="28" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="NTX-xi-YHj"/>
<constraint firstAttribute="width" constant="28" id="vUu-hA-NR3"/>
</constraints>
- <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" image="ic_close_spinner"/>
<connections>
<action selector="close" destination="P7f-MJ-gwN" eventType="touchUpInside" id="7tT-eB-g60"/>
@@ -788,20 +747,16 @@
<viewControllerLayoutGuide type="bottom" id="nJa-Wo-CTG"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="eTO-jl-C1f" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vGW-bq-fH5" userLabel="Container">
- <rect key="frame" x="40" y="0.0" width="520" height="600"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ITl-q8-Byo" userLabel="BoundsView">
- <rect key="frame" x="16" y="40" width="488" height="456"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tbk-TZ-Cly" userLabel="CenteredView">
- <rect key="frame" x="44" y="71" width="400" height="313"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="SZx-R6-NGK">
- <rect key="frame" x="90" y="0.0" width="220" height="220"/>
<constraints>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="3pQ-h3-lDE"/>
<constraint firstAttribute="width" secondItem="SZx-R6-NGK" secondAttribute="height" multiplier="1:1" id="JHG-qN-jGY"/>
@@ -809,9 +764,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Бронируй отель из приложения" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="snm-YK-UES" userLabel="Title">
- <rect key="frame" x="0.0" y="240" width="400" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -819,9 +773,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="При выборе отелей на карте будут отображаться ценовая категория и рейтинг заведения." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fz1-S6-6eL" userLabel="Text">
- <rect key="frame" x="0.0" y="280" width="400" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -829,7 +782,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="snm-YK-UES" firstAttribute="top" secondItem="tbk-TZ-Cly" secondAttribute="top" priority="740" constant="40" id="5yw-bh-sO5"/>
@@ -846,7 +799,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="tbk-TZ-Cly" firstAttribute="centerX" secondItem="ITl-q8-Byo" secondAttribute="centerX" id="E6w-Lj-l2a"/>
@@ -857,16 +810,15 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OjW-xF-Iie" userLabel="NotNow">
- <rect key="frame" x="140" y="516" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="82z-pQ-KWZ"/>
<constraint firstAttribute="width" constant="240" id="xE7-iY-0ku"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Next">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
@@ -880,7 +832,7 @@
</userDefinedRuntimeAttributes>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="600" id="7zL-gy-PCa"/>
<constraint firstItem="ITl-q8-Byo" firstAttribute="top" secondItem="vGW-bq-fH5" secondAttribute="top" constant="40" id="8t4-fD-AEI"/>
@@ -894,12 +846,11 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ZS-Cx-eDt">
- <rect key="frame" x="556" y="32" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="AJQ-MR-2Nc"/>
<constraint firstAttribute="height" constant="28" id="SPS-2W-vgR"/>
</constraints>
- <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" image="ic_close_spinner"/>
<connections>
<action selector="close" destination="J6A-Up-KBC" eventType="touchUpInside" id="UNP-oR-xPv"/>
@@ -934,6 +885,153 @@
</objects>
<point key="canvasLocation" x="3916" y="1932"/>
</scene>
+ <!--Whats New Profile Booking Controller-->
+ <scene sceneID="bvJ-qv-pLh">
+ <objects>
+ <viewController storyboardIdentifier="MWMWhatsNewProfileBookingController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="D0Q-aQ-soO" customClass="MWMWhatsNewProfileBookingController" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="ykz-7Y-P5F"/>
+ <viewControllerLayoutGuide type="bottom" id="HDv-2P-rpo"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="wKa-6r-SbD" customClass="SolidTouchView">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tEt-Eb-3MY" userLabel="Container">
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ijb-HU-C52" userLabel="BoundsView">
+ <subviews>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TPe-nO-YIS" userLabel="CenteredView">
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="ic_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="9Kf-gP-xXN">
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="120" id="Hp2-f3-Ba4"/>
+ <constraint firstAttribute="width" secondItem="9Kf-gP-xXN" secondAttribute="height" multiplier="1:1" id="Tpz-CT-wzN"/>
+ <constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="220" id="jUo-PM-UZA"/>
+ </constraints>
+ </imageView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Бронируй отель из приложения" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gQf-dx-QkP" userLabel="Title">
+ <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
+ </userDefinedRuntimeAttributes>
+ </label>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="При выборе отелей на карте будут отображаться ценовая категория и рейтинг заведения." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K1V-YA-EyH" userLabel="Text">
+ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <nil key="highlightedColor"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
+ </userDefinedRuntimeAttributes>
+ </label>
+ </subviews>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ <accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
+ <constraints>
+ <constraint firstItem="9Kf-gP-xXN" firstAttribute="top" secondItem="TPe-nO-YIS" secondAttribute="top" id="0t1-iU-vUW"/>
+ <constraint firstItem="9Kf-gP-xXN" firstAttribute="centerX" secondItem="TPe-nO-YIS" secondAttribute="centerX" id="1Ku-Uf-gka"/>
+ <constraint firstItem="K1V-YA-EyH" firstAttribute="top" secondItem="gQf-dx-QkP" secondAttribute="bottom" constant="16" id="B22-RU-Du5"/>
+ <constraint firstItem="K1V-YA-EyH" firstAttribute="width" secondItem="TPe-nO-YIS" secondAttribute="width" id="DKm-6r-nvs"/>
+ <constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="OjB-Dq-4eC"/>
+ <constraint firstItem="gQf-dx-QkP" firstAttribute="width" secondItem="TPe-nO-YIS" secondAttribute="width" id="QCC-34-Wpl"/>
+ <constraint firstAttribute="bottom" secondItem="K1V-YA-EyH" secondAttribute="bottom" id="VMN-Oj-FFw"/>
+ <constraint firstItem="K1V-YA-EyH" firstAttribute="centerX" secondItem="TPe-nO-YIS" secondAttribute="centerX" id="X2u-eu-WOy"/>
+ <constraint firstItem="gQf-dx-QkP" firstAttribute="top" secondItem="TPe-nO-YIS" secondAttribute="top" priority="740" constant="40" id="b9J-q4-ksP"/>
+ <constraint firstItem="gQf-dx-QkP" firstAttribute="top" secondItem="9Kf-gP-xXN" secondAttribute="bottom" priority="750" constant="20" id="e8L-B4-IM6"/>
+ <constraint firstItem="gQf-dx-QkP" firstAttribute="centerX" secondItem="TPe-nO-YIS" secondAttribute="centerX" id="gx2-nU-h1g"/>
+ </constraints>
+ </view>
+ </subviews>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ <accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
+ <constraints>
+ <constraint firstItem="TPe-nO-YIS" firstAttribute="leading" secondItem="Ijb-HU-C52" secondAttribute="leading" priority="999" id="BCw-2h-SFs"/>
+ <constraint firstItem="TPe-nO-YIS" firstAttribute="centerY" secondItem="Ijb-HU-C52" secondAttribute="centerY" id="ez4-HU-1M6"/>
+ <constraint firstAttribute="trailing" secondItem="TPe-nO-YIS" secondAttribute="trailing" priority="999" id="nwk-Ge-uLd"/>
+ <constraint firstItem="TPe-nO-YIS" firstAttribute="height" relation="lessThanOrEqual" secondItem="Ijb-HU-C52" secondAttribute="height" id="pn8-Y4-KUr"/>
+ <constraint firstItem="TPe-nO-YIS" firstAttribute="centerX" secondItem="Ijb-HU-C52" secondAttribute="centerX" id="sb1-6l-pkl"/>
+ </constraints>
+ </view>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOC-GL-XE3" userLabel="NotNow">
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="44" id="E6P-sq-QNp"/>
+ <constraint firstAttribute="width" constant="240" id="sF1-aJ-hh9"/>
+ </constraints>
+ <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
+ <state key="normal" title="Next">
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </state>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="textColorHighlightedName" value="white"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
+ <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+ <integer key="value" value="8"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="white"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="linkBlue"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="backgroundHighlightedColorName" value="linkBlueHighlighted"/>
+ </userDefinedRuntimeAttributes>
+ </button>
+ </subviews>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="DOC-GL-XE3" secondAttribute="bottom" constant="40" id="2Di-cK-wcY"/>
+ <constraint firstItem="9Kf-gP-xXN" firstAttribute="height" secondItem="tEt-Eb-3MY" secondAttribute="height" multiplier="0.3" priority="750" id="6kI-LR-9t9"/>
+ <constraint firstItem="DOC-GL-XE3" firstAttribute="top" secondItem="Ijb-HU-C52" secondAttribute="bottom" constant="20" id="IiB-UZ-7sb"/>
+ <constraint firstAttribute="width" constant="520" id="LhG-2j-IgC"/>
+ <constraint firstAttribute="height" constant="600" id="QaY-l6-crt"/>
+ <constraint firstAttribute="trailing" secondItem="Ijb-HU-C52" secondAttribute="trailing" constant="16" id="WM5-se-bnN"/>
+ <constraint firstItem="Ijb-HU-C52" firstAttribute="leading" secondItem="tEt-Eb-3MY" secondAttribute="leading" constant="16" id="eNl-bG-heb"/>
+ <constraint firstItem="Ijb-HU-C52" firstAttribute="top" secondItem="tEt-Eb-3MY" secondAttribute="top" constant="40" id="hrO-ye-EyW"/>
+ <constraint firstItem="DOC-GL-XE3" firstAttribute="centerX" secondItem="tEt-Eb-3MY" secondAttribute="centerX" id="yIm-ju-0St"/>
+ </constraints>
+ </view>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="63Z-Dp-kPv">
+ <constraints>
+ <constraint firstAttribute="width" constant="28" id="dqY-MR-itL"/>
+ <constraint firstAttribute="height" constant="28" id="vgo-Ks-ho5"/>
+ </constraints>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
+ <state key="normal" image="ic_close_spinner"/>
+ <connections>
+ <action selector="close" destination="D0Q-aQ-soO" eventType="touchUpInside" id="njH-59-dyC"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="tEt-Eb-3MY" firstAttribute="centerY" secondItem="wKa-6r-SbD" secondAttribute="centerY" id="4SN-fY-s0Z"/>
+ <constraint firstAttribute="trailing" secondItem="63Z-Dp-kPv" secondAttribute="trailing" constant="16" id="AEC-eh-01G"/>
+ <constraint firstItem="63Z-Dp-kPv" firstAttribute="top" secondItem="ykz-7Y-P5F" secondAttribute="bottom" constant="12" id="Ewa-1T-I9n"/>
+ <constraint firstItem="tEt-Eb-3MY" firstAttribute="centerX" secondItem="wKa-6r-SbD" secondAttribute="centerX" id="cRJ-wu-7na"/>
+ </constraints>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
+ </userDefinedRuntimeAttributes>
+ </view>
+ <connections>
+ <outlet property="alertText" destination="K1V-YA-EyH" id="o7a-dS-fiG"/>
+ <outlet property="alertTitle" destination="gQf-dx-QkP" id="ult-qw-ApT"/>
+ <outlet property="containerHeight" destination="QaY-l6-crt" id="UWK-bc-KnQ"/>
+ <outlet property="containerView" destination="tEt-Eb-3MY" id="wCF-U7-rRn"/>
+ <outlet property="containerWidth" destination="LhG-2j-IgC" id="kp4-Gk-mT7"/>
+ <outlet property="image" destination="9Kf-gP-xXN" id="F9d-1Q-Cvh"/>
+ <outlet property="imageHeight" destination="6kI-LR-9t9" id="Q8C-J6-vla"/>
+ <outlet property="imageMinHeight" destination="Hp2-f3-Ba4" id="Hfw-uv-oro"/>
+ <outlet property="nextPageButton" destination="DOC-GL-XE3" id="v4G-yf-z2p"/>
+ <outlet property="titleImageOffset" destination="e8L-B4-IM6" id="qFe-dJ-fzR"/>
+ <outlet property="titleTopOffset" destination="b9J-q4-ksP" id="mH1-B1-uhq"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="6Uc-f0-gGu" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="2562" y="1932"/>
+ </scene>
</scenes>
<resources>
<image name="ic_close_spinner" width="28" height="28"/>
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 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
@@ -16,10 +17,8 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WqK-Yb-PmP" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wpf-tw-Coz" userLabel="Back">
- <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="ELC-D6-uQM"/>
<constraint firstAttribute="width" constant="44" id="e40-iL-uvR"/>
@@ -30,34 +29,30 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oQc-l8-sZH" userLabel="Buttons Box">
- <rect key="frame" x="81" y="0.0" width="158" height="44"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cZF-Ha-2tB">
- <rect key="frame" x="6" y="3" width="38" height="38"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="m6k-uU-yOl"/>
<constraint firstAttribute="height" constant="38" id="mp7-b4-xot"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FuO-c6-y9C" userLabel="Bicycle">
- <rect key="frame" x="60" y="3" width="38" height="38"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="9fe-fw-05J"/>
<constraint firstAttribute="height" constant="38" id="gbm-NL-zgv"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6D3-QF-6wm">
- <rect key="frame" x="114" y="3" width="38" height="38"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="38" id="815-LJ-2tk"/>
<constraint firstAttribute="height" constant="38" id="hXi-E7-GUb"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="FuO-c6-y9C" firstAttribute="centerY" secondItem="oQc-l8-sZH" secondAttribute="centerY" id="1De-4s-V8t"/>
<constraint firstItem="6D3-QF-6wm" firstAttribute="leading" secondItem="FuO-c6-y9C" secondAttribute="trailing" constant="16" id="91z-iC-oKp"/>
@@ -70,21 +65,18 @@
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_up_and_down" translatesAutoresizingMaskIntoConstraints="NO" id="y8P-JL-riK">
- <rect key="frame" x="292" y="18" width="13" height="8"/>
<constraints>
<constraint firstAttribute="width" constant="13" id="LtD-Tz-US7"/>
<constraint firstAttribute="height" constant="8" id="uez-1b-JG5"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0YR-3a-ucN">
- <rect key="frame" x="276" y="0.0" width="44" height="44"/>
<connections>
<action selector="extendTap" destination="aNH-vh-DPz" eventType="touchUpInside" id="oYh-e3-3Ln"/>
</connections>
</button>
<collectionView multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="DrK-vI-WkO">
- <rect key="frame" x="8" y="48" width="304" height="80"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="3R7-i6-rG1"/>
</constraints>
@@ -99,7 +91,7 @@
</connections>
</collectionView>
</subviews>
- <color key="backgroundColor" red="0.12156862745098039" green="0.59999999999999998" blue="0.32156862745098036" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.12156862745098039" green="0.59999999999999998" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="140" id="2SX-TZ-tS3"/>
<constraint firstItem="0YR-3a-ucN" firstAttribute="top" secondItem="WqK-Yb-PmP" secondAttribute="top" id="DyS-8t-eoF"/>
@@ -121,7 +113,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="WqK-Yb-PmP" secondAttribute="trailing" id="hui-oa-rbV"/>
<constraint firstItem="WqK-Yb-PmP" firstAttribute="leading" secondItem="aNH-vh-DPz" secondAttribute="leading" id="rQB-KG-9Kg"/>
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 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
- <mutableArray key="HelveticaNeue.ttc">
+ <array key="HelveticaNeue.ttc">
<string>HelveticaNeue-Medium</string>
- </mutableArray>
+ </array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMNavigationDashboardManager">
@@ -22,10 +23,8 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3s2-BV-X5i" customClass="SolidTouchView">
- <rect key="frame" x="0.0" y="0.0" width="320" height="140"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a4n-5I-PN3" userLabel="Back">
- <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="huq-Vr-EM5"/>
<constraint firstAttribute="width" constant="44" id="zCn-K4-Ax9"/>
@@ -36,31 +35,27 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sXu-tl-a0m" userLabel="Buttons Box">
- <rect key="frame" x="75" y="0.0" width="170" height="44"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jDl-pu-eov">
- <rect key="frame" x="6" y="0.0" width="44" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="jDl-pu-eov" secondAttribute="height" multiplier="1:1" id="o1x-sd-13z"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yiM-fM-sSS" userLabel="Bicycle">
- <rect key="frame" x="66" y="0.0" width="44" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="yiM-fM-sSS" secondAttribute="height" multiplier="1:1" id="rnk-51-Cjg"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VhE-hA-Leo">
- <rect key="frame" x="126" y="3" width="38" height="38"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="VhE-hA-Leo" secondAttribute="height" multiplier="1:1" id="V4H-0m-WCy"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="jDl-pu-eov" firstAttribute="leading" secondItem="sXu-tl-a0m" secondAttribute="leading" constant="6" id="4B3-wd-Hli"/>
<constraint firstItem="VhE-hA-Leo" firstAttribute="leading" secondItem="yiM-fM-sSS" secondAttribute="trailing" constant="16" id="5aG-G0-kVn"/>
@@ -75,8 +70,7 @@
</constraints>
</view>
<collectionView multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="TC0-58-PO9">
- <rect key="frame" x="8" y="48" width="304" height="80"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="80" id="exN-o8-Rx8"/>
</constraints>
@@ -96,7 +90,7 @@
</connections>
</collectionView>
</subviews>
- <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="sXu-tl-a0m" firstAttribute="bottom" secondItem="a4n-5I-PN3" secondAttribute="bottom" id="4NN-cC-Tsg"/>
<constraint firstAttribute="height" constant="140" id="7e9-gc-Y07"/>
@@ -113,15 +107,12 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87p-Qg-8f3" userLabel="Status Box">
- <rect key="frame" x="0.0" y="176" width="320" height="64"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tdV-a8-fmG" userLabel="Planning Box">
- <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Planning..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="a7v-h1-j52">
- <rect key="frame" x="120" y="22" width="80" height="20"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="p2p_planning"/>
@@ -130,19 +121,17 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="a7v-h1-j52" firstAttribute="centerX" secondItem="tdV-a8-fmG" secondAttribute="centerX" id="L9h-b7-iGd"/>
<constraint firstItem="a7v-h1-j52" firstAttribute="centerY" secondItem="tdV-a8-fmG" secondAttribute="centerY" id="PGc-Ph-A2k"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QEP-6s-YTM" userLabel="Error Box">
- <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Planning..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="VNi-4g-9gz" userLabel="Error">
- <rect key="frame" x="120" y="22" width="80" height="20"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="routing_planning_error"/>
@@ -151,19 +140,17 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="VNi-4g-9gz" firstAttribute="centerY" secondItem="QEP-6s-YTM" secondAttribute="centerY" id="bfa-sc-ifi"/>
<constraint firstItem="VNi-4g-9gz" firstAttribute="centerX" secondItem="QEP-6s-YTM" secondAttribute="centerX" id="iKJ-3u-Al9"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rqr-bu-crx" userLabel="Results Box">
- <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="results" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zml-eW-DsI">
- <rect key="frame" x="16" y="14" width="288" height="20"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -171,38 +158,63 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Arrive at 12:24" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oec-Ee-6ha">
- <rect key="frame" x="16" y="38" width="288" height="17"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
</userDefinedRuntimeAttributes>
</label>
+ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rXP-rM-9cx">
+ <subviews>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_elevation" translatesAutoresizingMaskIntoConstraints="NO" id="Ac5-gf-3tf">
+ <constraints>
+ <constraint firstAttribute="width" constant="10" id="R4J-Uu-52U"/>
+ <constraint firstAttribute="height" constant="12" id="v5V-2M-Fnx"/>
+ </constraints>
+ </imageView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="260" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JtS-om-arD">
+ <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
+ </userDefinedRuntimeAttributes>
+ </label>
+ </subviews>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <constraints>
+ <constraint firstItem="Ac5-gf-3tf" firstAttribute="leading" secondItem="rXP-rM-9cx" secondAttribute="leading" id="2Df-WK-py6"/>
+ <constraint firstAttribute="trailing" secondItem="JtS-om-arD" secondAttribute="trailing" id="CK8-gu-qaf"/>
+ <constraint firstAttribute="bottom" secondItem="Ac5-gf-3tf" secondAttribute="bottom" id="ULt-mY-leX"/>
+ <constraint firstItem="JtS-om-arD" firstAttribute="centerY" secondItem="Ac5-gf-3tf" secondAttribute="centerY" id="mrf-cl-Rte"/>
+ <constraint firstItem="Ac5-gf-3tf" firstAttribute="top" secondItem="rXP-rM-9cx" secondAttribute="top" id="pUr-w4-lnd"/>
+ <constraint firstItem="JtS-om-arD" firstAttribute="leading" secondItem="Ac5-gf-3tf" secondAttribute="trailing" constant="4" id="qQ6-yw-n2d"/>
+ </constraints>
+ </view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="oec-Ee-6ha" firstAttribute="leading" secondItem="zml-eW-DsI" secondAttribute="leading" id="Am2-25-Zn9"/>
- <constraint firstAttribute="trailing" secondItem="zml-eW-DsI" secondAttribute="trailing" constant="16" id="DRW-GJ-PG9"/>
+ <constraint firstItem="rXP-rM-9cx" firstAttribute="leading" secondItem="zml-eW-DsI" secondAttribute="trailing" constant="4" id="BCS-il-tys"/>
+ <constraint firstItem="rXP-rM-9cx" firstAttribute="centerY" secondItem="zml-eW-DsI" secondAttribute="centerY" id="PEx-MA-POC"/>
<constraint firstItem="zml-eW-DsI" firstAttribute="leading" secondItem="Rqr-bu-crx" secondAttribute="leading" constant="16" id="QNo-az-LlD"/>
<constraint firstAttribute="height" constant="64" id="bHW-iR-rAA"/>
<constraint firstItem="zml-eW-DsI" firstAttribute="top" secondItem="Rqr-bu-crx" secondAttribute="top" constant="14" id="c1k-EY-nwQ"/>
<constraint firstItem="oec-Ee-6ha" firstAttribute="top" secondItem="zml-eW-DsI" secondAttribute="bottom" constant="4" id="lV9-S0-yy4"/>
<constraint firstItem="oec-Ee-6ha" firstAttribute="trailing" secondItem="zml-eW-DsI" secondAttribute="trailing" id="rfO-2Z-g12"/>
+ <constraint firstAttribute="trailing" secondItem="rXP-rM-9cx" secondAttribute="trailing" constant="16" id="xUV-qS-bQc"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6iM-A6-4JK" userLabel="Height Box">
- <rect key="frame" x="0.0" y="64" width="320" height="68"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Apa-nH-KWJ">
- <rect key="frame" x="16" y="14" width="288" height="40"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zhI-92-6JG">
- <rect key="frame" x="0.0" y="0.0" width="288" height="40"/>
- </imageView>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="zhI-92-6JG"/>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="zhI-92-6JG" firstAttribute="top" secondItem="Apa-nH-KWJ" secondAttribute="top" id="7CP-bg-Id3"/>
<constraint firstAttribute="bottom" secondItem="zhI-92-6JG" secondAttribute="bottom" id="LeB-Rl-mPU"/>
@@ -211,7 +223,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Apa-nH-KWJ" secondAttribute="bottom" constant="14" id="8P4-RM-XZb"/>
<constraint firstAttribute="height" constant="68" id="Fl4-Tb-OER"/>
@@ -221,7 +233,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="tdV-a8-fmG" firstAttribute="leading" secondItem="Rqr-bu-crx" secondAttribute="leading" id="1s7-bh-347"/>
<constraint firstAttribute="height" constant="64" id="4qT-ha-p75"/>
@@ -241,7 +253,7 @@
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
@@ -250,15 +262,13 @@
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gcR-zj-b7P">
- <rect key="frame" x="0.0" y="607" width="320" height="48"/>
<subviews>
<button hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4IJ-pR-Ztp" userLabel="Go" customClass="MWMStartButton">
- <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
<accessibility key="accessibilityConfiguration" identifier="goButton"/>
<inset key="contentEdgeInsets" minX="8" minY="0.0" maxX="8" maxY="0.0"/>
<state key="normal" title="Start"/>
<state key="selected">
- <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="calibratedRGB"/>
+ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.26000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -272,7 +282,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="5GN-4g-vV1"/>
<constraint firstAttribute="trailing" secondItem="4IJ-pR-Ztp" secondAttribute="trailing" id="ML1-Xc-dlH"/>
@@ -282,7 +292,7 @@
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
@@ -291,7 +301,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="gcR-zj-b7P" firstAttribute="leading" secondItem="u2u-Vb-2eH" secondAttribute="leading" id="1RD-kG-W2O"/>
<constraint firstAttribute="trailing" secondItem="87p-Qg-8f3" secondAttribute="trailing" id="5wh-lx-rUz"/>
@@ -310,7 +320,7 @@
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
- <color key="value" white="0.0" alpha="0.23999999999999999" colorSpace="calibratedWhite"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
@@ -326,10 +336,13 @@
<outlet property="bicycle" destination="yiM-fM-sSS" id="pMf-6J-9Gd"/>
<outlet property="collectionView" destination="TC0-58-PO9" id="Onv-Ld-JPp"/>
<outlet property="contentView" destination="3s2-BV-X5i" id="mp7-Qq-drU"/>
+ <outlet property="elevationHeight" destination="JtS-om-arD" id="Dah-Ui-zNW"/>
+ <outlet property="elevationImage" destination="Ac5-gf-3tf" id="Gka-BR-4ZM"/>
<outlet property="errorBox" destination="QEP-6s-YTM" id="kH0-yP-1Gk"/>
<outlet property="goButton" destination="4IJ-pR-Ztp" id="48a-At-Nqq"/>
<outlet property="heightBox" destination="6iM-A6-4JK" id="cav-Cj-Aqr"/>
<outlet property="heightBoxHeight" destination="Fl4-Tb-OER" id="MEr-ms-WF4"/>
+ <outlet property="heightProfileElevation" destination="rXP-rM-9cx" id="9ME-YW-7qO"/>
<outlet property="heightProfileImage" destination="zhI-92-6JG" id="BAQ-2W-WFu"/>
<outlet property="layout" destination="YwC-vB-4LF" id="Hta-la-OdY"/>
<outlet property="pedestrian" destination="VhE-hA-Leo" id="R3O-th-Jw0"/>
@@ -345,6 +358,7 @@
</view>
</objects>
<resources>
+ <image name="ic_elevation" width="10" height="12"/>
<image name="ic_nav_bar_back" width="14" height="22"/>
</resources>
</document>
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/MapDownloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
index 099bf55614..bc12b85b51 100644
--- a/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
+++ b/iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
@@ -12,6 +12,7 @@
#import "MWMMapDownloaderTableViewCell.h"
#import "MWMMapDownloaderViewController.h"
#import "MWMMyTarget.h"
+#import "MWMMigrationViewController.h"
#import "MWMSegue.h"
#import "MWMStorage.h"
#import "MapsAppDelegate.h"
@@ -161,6 +162,20 @@ using namespace mwm;
}
- (void)configMyTarget { [MWMMyTarget manager].delegate = self; }
+
+- (void)backTap
+{
+ UINavigationController * navVC = self.navigationController;
+ NSArray<UIViewController *> * viewControllers = navVC.viewControllers;
+ NSInteger const viewControllersCount = viewControllers.count;
+ NSInteger const prevVCIndex = viewControllersCount - 2;
+ Class const migrationClass = [MWMMigrationViewController class];
+ if (prevVCIndex < 0 || [viewControllers[prevVCIndex] isKindOfClass:migrationClass])
+ [navVC popToRootViewControllerAnimated:YES];
+ else
+ [super backTap];
+}
+
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
{
[self.cellHeightCache removeAllObjects];
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<MWMWelcomeControllerProtocol> whatsNewClass = [MWMWhatsNewNavigationController class];
+ Class<MWMWelcomeControllerProtocol> whatsNewClass = [MWMWhatsNewProfileBookingController class];
BOOL const isFirstSession = [Alohalytics isFirstSession];
Class<MWMWelcomeControllerProtocol> welcomeClass =
isFirstSession ? [MWMFirstLaunchController class] : whatsNewClass;
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;
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<NSValue *, NSData *> * 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;
});
}
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,6 +1,16 @@
{
"images" : [
{
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "size" : "20x20",
+ "scale" : "3x"
+ },
+ {
"size" : "29x29",
"idiom" : "iphone",
"filename" : "29x29@2x.png",
@@ -37,6 +47,16 @@
"scale" : "3x"
},
{
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "20x20",
+ "scale" : "2x"
+ },
+ {
"size" : "29x29",
"idiom" : "ipad",
"filename" : "29x29-1.png",
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json
index 429f4f075a..91f4d2540c 100644
--- a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/Contents.json
@@ -2,22 +2,25 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "img_bikecycle_navigation.png",
+ "filename" : "ic_elevation.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "img_bikecycle_navigation@2x.png",
+ "filename" : "ic_elevation@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "img_bikecycle_navigation@3x.png",
+ "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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation.png
Binary files 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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@2x.png
Binary files 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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/NavigationDashboard/ic_elevation.imageset/ic_elevation@3x.png
Binary files differ
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
--- a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_bikecycle_navigation.imageset/img_bikecycle_navigation@3x.png
+++ /dev/null
Binary files differ
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
--- a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/img_booking@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_editor_upd.imageset/img_editor_upd@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_nightmode.imageset/img_nightmode@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_car_navigation.imageset/img_whatsnew_car_navigation@3x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@2x.png
+++ /dev/null
Binary files 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
--- a/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_cycle_navigation_improved.imageset/img_whatsnew_cycle_navigation_improved@3x.png
+++ /dev/null
Binary files differ
diff --git a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json
index d758a56231..aa8ec701ce 100644
--- a/iphone/Maps/Images.xcassets/Whats New/img_booking.imageset/Contents.json
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/Contents.json
@@ -2,17 +2,17 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "img_booking.png",
+ "filename" : "imgWhatsnewRouteProfile.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "img_booking@2x.png",
+ "filename" : "imgWhatsnewRouteProfile@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "img_booking@3x.png",
+ "filename" : "imgWhatsnewRouteProfile@3x.png",
"scale" : "3x"
}
],
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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile.png
Binary files 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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@2x.png
Binary files 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
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Whats New/img_whatsnew_route_profile.imageset/imgWhatsnewRouteProfile@3x.png
Binary files differ
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 @@
<false/>
<key>Pushwoosh_LOG_LEVEL</key>
<string>WARNING</string>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>Unused by an application</string>
+ <key>NSCameraUsageDescription</key>
+ <string>Unused by an application</string>
</dict>
</plist>
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/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 3b8e1a7e43..c3f362facd 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 */; };
@@ -274,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 */; };
@@ -1116,6 +1118,8 @@
349C3AEB1D33A933002AC7A9 /* MWMNavigationInfoView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNavigationInfoView.mm; sourceTree = "<group>"; };
349C3AEE1D33A96B002AC7A9 /* MWMNavigationInfoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNavigationInfoView.xib; sourceTree = "<group>"; };
349C3AF11D33C6EE002AC7A9 /* MWMNavigationDashboardInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardInfoProtocol.h; sourceTree = "<group>"; };
+ 349CCECC1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMWhatsNewProfileBookingController.h; path = Welcome/MWMWhatsNewProfileBookingController.h; sourceTree = "<group>"; };
+ 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMWhatsNewProfileBookingController.mm; path = Welcome/MWMWhatsNewProfileBookingController.mm; sourceTree = "<group>"; };
34A62D4C1C903533007FDCB7 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
34A62D4D1C903533007FDCB7 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
34AA7D9D1D63543E00254037 /* MWMRouterSavedState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMRouterSavedState.h; sourceTree = "<group>"; };
@@ -2932,6 +2936,8 @@
345A2DCA1D0B0EB600A7DD39 /* MWMWhatsNewBookingBicycleRoutingController.mm */,
34664CF81D4A0262003D7096 /* MWMWhatsNewNavigationController.h */,
34664CF91D4A0262003D7096 /* MWMWhatsNewNavigationController.mm */,
+ 349CCECC1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.h */,
+ 349CCECD1D8BCA5400C89395 /* MWMWhatsNewProfileBookingController.mm */,
);
name = Welcome;
sourceTree = "<group>";
@@ -3271,6 +3277,7 @@
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = 3T6FSDE8C7;
+ ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.ApplicationGroups.iOS = {
enabled = 0;
@@ -3285,6 +3292,7 @@
};
6741A93D1BF340DE002C974C = {
DevelopmentTeam = 3T6FSDE8C7;
+ ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.Push = {
enabled = 1;
@@ -3867,6 +3875,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 +4110,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 */,
@@ -4226,7 +4236,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",
@@ -4254,6 +4265,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",
@@ -4282,6 +4295,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",
@@ -4313,6 +4328,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",
@@ -4341,6 +4358,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",
@@ -4372,6 +4391,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",
@@ -4414,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.2;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4442,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",
@@ -4494,6 +4515,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",
@@ -4532,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.2;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -4561,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",
@@ -4613,6 +4636,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",
@@ -4651,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.2;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4684,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",
@@ -4736,6 +4761,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",
@@ -4774,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.2;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4807,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",
@@ -4859,6 +4886,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",
@@ -4897,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.2;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4928,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",
@@ -4980,6 +5009,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",
@@ -5018,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.2;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -5049,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",
@@ -5101,6 +5132,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",
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 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Wns-nH-AQU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Wns-nH-AQU">
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
- <mutableArray key="HelveticaNeue.ttc">
+ <array key="HelveticaNeue.ttc">
<string>HelveticaNeue-Medium</string>
- <string>HelveticaNeue-Medium</string>
- </mutableArray>
+ </array>
</customFonts>
<scenes>
<!--Map View Controller-->
@@ -23,9 +23,9 @@
<viewControllerLayoutGuide type="bottom" id="uu8-Gq-3iY"/>
</layoutGuides>
<view key="view" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" id="USG-6L-Uhw" customClass="EAGLView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<navigationItem key="navigationItem" id="8E8-0f-UV9"/>
<connections>
@@ -50,7 +50,7 @@
<objects>
<navigationController automaticallyAdjustsScrollViewInsets="NO" navigationBarHidden="YES" id="Wns-nH-AQU" customClass="MWMNavigationController" sceneMemberID="viewController">
<toolbarItems/>
- <navigationBar key="navigationBar" contentMode="scaleToFill" id="OK2-RC-YDq">
+ <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="OK2-RC-YDq">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
@@ -68,23 +68,22 @@
<objects>
<tableViewController storyboardIdentifier="MWMSettingsViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="Rr6-uj-G5f" customClass="MWMSettingsViewController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="zyF-i7-Uoj">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
<tableViewSection id="eZf-AO-B39">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="yh8-cr-14c" customClass="LinkCell">
- <rect key="frame" x="0.0" y="99" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="99" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yh8-cr-14c" id="MYm-HI-oOR">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Профиль" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="8jb-wX-P4h">
- <rect key="frame" x="16" y="12" width="72" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -93,9 +92,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="igortomko" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gix-nv-IcA">
- <rect key="frame" x="489" y="12" width="78" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -126,16 +124,15 @@
<tableViewSection headerTitle="ОБЩИЕ НАСТРОЙКИ" footerTitle="Сбор статистики помогает нам совершенствовать приложение." id="Swo-3Q-lWx">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="Igk-BI-aHN" customClass="LinkCell">
- <rect key="frame" x="0.0" y="185" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="199" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Igk-BI-aHN" id="Qae-gb-v0B">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Единицы измерения" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="RB1-Nr-K3T">
- <rect key="frame" x="16" y="12" width="451" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -144,9 +141,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Километры " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZzK-qL-wC4">
- <rect key="frame" x="471" y="12" width="96" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -173,17 +169,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="LYi-oF-eGj" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="229" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="243" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LYi-oF-eGj" id="6SA-kx-JeG">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Кнопки масштаба" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="OM9-RZ-sca">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -192,9 +187,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="taQ-3Z-nh3">
- <rect key="frame" x="535" y="6" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -218,17 +212,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="0Lf-xU-P2U" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="273" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="287" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Lf-xU-P2U" id="3Q1-iE-5pP">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3D здания" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="tU0-tQ-usy">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -237,9 +230,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aMo-Df-9LS">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -263,17 +255,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="eE4-OC-9uX" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="317" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="331" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eE4-OC-9uX" id="xJx-2K-AIP">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Автозагрузка" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="6ZU-5V-v0J">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -282,9 +273,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f8R-Di-osU">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -308,16 +298,15 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="VyW-Wh-2QX" customClass="LinkCell">
- <rect key="frame" x="0.0" y="361" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="375" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VyW-Wh-2QX" id="ihq-PO-ic8">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Недавно пройденый путь" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="3ew-eh-kVT">
- <rect key="frame" x="16" y="12" width="474" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -326,9 +315,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="12 часов " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E18-yq-nve">
- <rect key="frame" x="494" y="12" width="73" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -355,17 +343,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="P5e-67-f4k" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="405" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="419" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="P5e-67-f4k" id="RlB-hW-A2l">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Калибровка компаса" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="Xqo-QZ-3fd">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -374,9 +361,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hRC-jd-ViV">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -400,17 +386,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="NOt-bc-7ls" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="449" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="463" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NOt-bc-7ls" id="xdj-y5-zpk">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Сбор статистики" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="K9e-I1-pZu">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -419,9 +404,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y8g-7o-Lbp">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -449,16 +433,15 @@
<tableViewSection headerTitle="НАВИГАЦИЯ" id="E4E-hs-9xW">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="QNt-XC-xma" customClass="LinkCell">
- <rect key="frame" x="0.0" y="559" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="592" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QNt-XC-xma" id="fBV-aJ-Mo8">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ночной режим" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="q7P-cj-3tZ">
- <rect key="frame" x="16" y="12" width="423" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -467,9 +450,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Автоматически" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g5c-Yk-svX">
- <rect key="frame" x="443" y="12" width="124" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -496,17 +478,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="X5R-fv-yd7" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="603" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="636" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X5R-fv-yd7" id="s7y-Nu-Y01">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Перспективный вид" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="tmn-CU-6EB">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -515,9 +496,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m0S-BP-FrU">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -541,17 +521,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="veW-Fm-2Hl" customClass="SwitchCell">
- <rect key="frame" x="0.0" y="647" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="680" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="veW-Fm-2Hl" id="AP7-jd-F4b">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Автозум" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" preferredMaxLayoutWidth="462" translatesAutoresizingMaskIntoConstraints="NO" id="qL3-bA-5tn">
- <rect key="frame" x="16" y="11" width="511" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -560,9 +539,8 @@
</userDefinedRuntimeAttributes>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ipg-f4-K5Q">
- <rect key="frame" x="535" y="7" width="51" height="31"/>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
- <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="onTintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
</userDefinedRuntimeAttributes>
@@ -586,16 +564,15 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="nED-2n-gN6" customClass="LinkCell">
- <rect key="frame" x="0.0" y="691" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="724" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nED-2n-gN6" id="2oQ-0g-poj">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Голосовые инструкции" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="185" translatesAutoresizingMaskIntoConstraints="NO" id="2v2-mU-aWi">
- <rect key="frame" x="16" y="12" width="459" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -604,9 +581,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="700" text="Nederlands" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="88" translatesAutoresizingMaskIntoConstraints="NO" id="DQG-mX-mR7">
- <rect key="frame" x="479" y="12" width="88" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
@@ -637,16 +613,15 @@
<tableViewSection headerTitle="ИНФОРМАЦИЯ" id="i4H-WV-BaS">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="JTZ-K9-RVv" customClass="LinkCell">
- <rect key="frame" x="0.0" y="777" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="817" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JTZ-K9-RVv" id="mHA-wn-hse">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Спавочный центр" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="535" translatesAutoresizingMaskIntoConstraints="NO" id="7ty-Jh-0Rp">
- <rect key="frame" x="16" y="12" width="535" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -670,21 +645,20 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="Kv3-pO-jV5" customClass="LinkCell">
- <rect key="frame" x="0.0" y="821" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="861" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kv3-pO-jV5" id="8mJ-wm-9uJ">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="О приложении" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="535" translatesAutoresizingMaskIntoConstraints="NO" id="cS1-Lw-pFx">
- <rect key="frame" x="16" y="12" width="535" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
- <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="about"/>
+ <userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="about_menu_title"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
@@ -745,23 +719,23 @@
<objects>
<tableViewController id="kBJ-ZO-Mca" customClass="MWMNightModeController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="fpP-Ix-QtX">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
<tableViewSection id="XFW-hZ-fJo">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="Hgm-jL-Gnn" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="35" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="35" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hgm-jL-Gnn" id="LeE-yP-Eoi">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Auto" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="sHx-XL-o9h">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Auto" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="sHx-XL-o9h">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -785,16 +759,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="WyO-qs-a7i" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="79" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="79" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WyO-qs-a7i" id="q2k-AU-VdG">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="um4-D2-sR5">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="On" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="um4-D2-sR5">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -818,16 +792,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="HHw-BT-UeJ" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="123" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="123" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HHw-BT-UeJ" id="WD5-kW-BlC">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Off" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="abU-K0-dr3">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Off" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="abU-K0-dr3">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -873,23 +847,23 @@
<objects>
<tableViewController id="NP0-s9-34g" customClass="MWMRecentTrackSettingsController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Ai6-eS-WuL">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
<tableViewSection id="0dw-og-Sit">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="HL5-jQ-yNK" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="35" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="35" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HL5-jQ-yNK" id="DYw-KH-oDU">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="None" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="2i3-c9-tdU">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="None" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="2i3-c9-tdU">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -913,16 +887,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="8Cq-dm-roX" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="79" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="79" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8Cq-dm-roX" id="62b-vT-xng">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 hour" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="J1O-iW-GF3">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="1 hour" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="J1O-iW-GF3">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -946,16 +920,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="DIL-q2-mUp" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="123" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="123" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DIL-q2-mUp" id="IqW-Xu-xVP">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="55i-C3-b9S">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="2 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="55i-C3-b9S">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -979,16 +953,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="1Mm-WA-eyt" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="167" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="167" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Mm-WA-eyt" id="lNb-wL-PFo">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="QrP-xT-fcM">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="6 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="QrP-xT-fcM">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1012,16 +986,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="JLY-Qt-y88" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="211" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="211" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JLY-Qt-y88" id="jPr-Kt-mLi">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="HyC-if-zpD">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="12 hours" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="HyC-if-zpD">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1045,16 +1019,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="mbv-1J-wSI" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="255" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="255" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mbv-1J-wSI" id="oPS-HW-hfW">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 day" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="uhN-0k-BL7">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="1 day" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="uhN-0k-BL7">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1103,21 +1077,21 @@
<objects>
<tableViewController id="XDU-iY-yV9" customClass="MWMTTSSettingsViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="UXT-6R-4is">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="79I-kz-hl4" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="49" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="79I-kz-hl4" id="gBB-ji-big">
- <rect key="frame" x="0.0" y="0.0" width="561" height="43"/>
+ <frame key="frameInset" width="336" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="FSn-fP-n3e">
- <rect key="frame" x="16" y="11" width="527" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="FSn-fP-n3e">
+ <frame key="frameInset" minX="16" minY="11" width="527" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1140,16 +1114,16 @@
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="lO6-zb-qb8" customClass="LinkCell">
- <rect key="frame" x="0.0" y="93" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="100" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lO6-zb-qb8" id="35k-Nb-XSD">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Other" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="arm-Sx-diY">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Other" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="483" translatesAutoresizingMaskIntoConstraints="NO" id="arm-Sx-diY">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1192,9 +1166,9 @@
<objects>
<tableViewController id="lFr-lA-JTW" customClass="MWMEditBookmarkController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rb3-ea-7LJ">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="dataSource" destination="lFr-lA-JTW" id="4az-BJ-Lrq"/>
<outlet property="delegate" destination="lFr-lA-JTW" id="bq1-tq-uZc"/>
@@ -1211,7 +1185,7 @@
<objects>
<navigationController id="Psz-BY-Fy4" customClass="MWMNavigationController" sceneMemberID="viewController">
<value key="contentSizeForViewInPopover" type="size" width="600" height="600"/>
- <navigationBar key="navigationBar" contentMode="scaleToFill" id="SUN-3A-xgM">
+ <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="SUN-3A-xgM">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
@@ -1228,21 +1202,21 @@
<objects>
<tableViewController id="13e-Bs-Dwh" customClass="MWMTTSLanguageViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="3eG-G0-XZP">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="6Px-TO-sMc" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="49" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="56" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Px-TO-sMc" id="aqp-aV-B3y">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="516" translatesAutoresizingMaskIntoConstraints="NO" id="wBg-nH-SXL">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Русский" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="516" translatesAutoresizingMaskIntoConstraints="NO" id="wBg-nH-SXL">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1282,10 +1256,10 @@
<scene sceneID="XbW-Wc-ZB3">
<objects>
<tableViewController id="Lfa-Zp-orR" customClass="MWMEditorViewController" sceneMemberID="viewController">
- <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="dataSource" destination="Lfa-Zp-orR" id="xpr-4K-awa"/>
<outlet property="delegate" destination="Lfa-Zp-orR" id="h68-o4-xW2"/>
@@ -1313,12 +1287,12 @@
<viewControllerLayoutGuide type="bottom" id="qqk-Uc-qcN"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="U1f-hD-9rl">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1">
- <rect key="frame" x="0.0" y="20" width="600" height="536"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1">
+ <frame key="frameInset" minY="20" width="600" height="536"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
@@ -1327,12 +1301,12 @@
<outlet property="delegate" destination="Ld6-gM-2hk" id="ZEW-mV-BbV"/>
</connections>
</tableView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aQv-7U-zAP">
- <rect key="frame" x="0.0" y="20" width="600" height="536"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aQv-7U-zAP">
+ <frame key="frameInset" minY="20" width="600" height="536"/>
<subviews>
- <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="PrH-u2-IEv" userLabel="Editor View" customClass="MWMTextView">
- <rect key="frame" x="0.0" y="36" width="600" height="88"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="PrH-u2-IEv" userLabel="Editor View" customClass="MWMTextView">
+ <frame key="frameInset" minY="36" width="600" height="88"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="88" id="oAE-yX-hVe"/>
<constraint firstAttribute="height" priority="750" constant="88" id="oBv-SK-cOU"/>
@@ -1349,8 +1323,8 @@
<outlet property="delegate" destination="Ld6-gM-2hk" id="Ewa-a5-hAF"/>
</connections>
</textView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="z2Z-G2-Np7">
- <rect key="frame" x="0.0" y="35" width="600" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="z2Z-G2-Np7">
+ <frame key="frameInset" minY="35" width="600" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="xUX-ck-MQb"/>
</constraints>
@@ -1358,8 +1332,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="ebA-fW-ddJ">
- <rect key="frame" x="0.0" y="123" width="600" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="ebA-fW-ddJ">
+ <frame key="frameInset" minY="123" width="600" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="HOj-tZ-b3F"/>
</constraints>
@@ -1367,8 +1341,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="5T5-Pp-hb5">
- <rect key="frame" x="0.0" y="491" width="600" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="5T5-Pp-hb5">
+ <frame key="frameInset" minY="491" width="600" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ZXK-zv-uSz"/>
</constraints>
@@ -1376,8 +1350,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="IX2-yp-0oa">
- <rect key="frame" x="0.0" y="164" width="600" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="IX2-yp-0oa">
+ <frame key="frameInset" minY="164" width="600" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="rD4-fE-ez2"/>
</constraints>
@@ -1385,16 +1359,15 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View">
- <rect key="frame" x="0.0" y="164" width="600" height="328"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View">
+ <frame key="frameInset" minY="164" width="600" height="328"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button">
+ <frame key="frameInset" width="600" height="44"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Example values" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="dAM-iT-fzu">
- <rect key="frame" x="16" y="12" width="120" height="20"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -1402,8 +1375,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_example_values"/>
</userDefinedRuntimeAttributes>
</label>
- <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_down" translatesAutoresizingMaskIntoConstraints="NO" id="m7d-sG-5LN">
- <rect key="frame" x="568" y="10" width="24" height="24"/>
+ <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="ic_arrow_gray_down" translatesAutoresizingMaskIntoConstraints="NO" id="m7d-sG-5LN">
+ <frame key="frameInset" minX="568" minY="10" width="24" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="2aF-WV-ER2"/>
<constraint firstAttribute="width" constant="24" id="eak-KY-Xaa"/>
@@ -1412,8 +1385,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
</userDefinedRuntimeAttributes>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="Suj-t5-ZWs">
- <rect key="frame" x="16" y="44" width="584" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="Suj-t5-ZWs">
+ <frame key="frameInset" minX="16" minY="44" width="584" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cv8-Tg-Oin"/>
</constraints>
@@ -1421,15 +1394,15 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
</userDefinedRuntimeAttributes>
</imageView>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MiP-Du-s3i">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MiP-Du-s3i">
+ <frame key="frameInset" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<action selector="toggleExample" destination="Ld6-gM-2hk" eventType="touchUpInside" id="BGK-Ap-YBq"/>
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="Suj-t5-ZWs" secondAttribute="trailing" id="8Z7-Ws-OgZ"/>
<constraint firstAttribute="trailing" secondItem="m7d-sG-5LN" secondAttribute="trailing" constant="8" id="EGO-GU-Xk2"/>
@@ -1448,15 +1421,15 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
- <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j5R-JF-iCs">
- <rect key="frame" x="10" y="56" width="580" height="260"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <webView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j5R-JF-iCs">
+ <frame key="frameInset" minX="10" minY="56" width="580" height="260"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="260" id="sfy-fK-VSx"/>
</constraints>
</webView>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="j5R-JF-iCs" secondAttribute="trailing" priority="500" constant="10" id="6tr-YK-3US"/>
<constraint firstItem="n79-h1-Nk3" firstAttribute="top" secondItem="85Z-MR-kUV" secondAttribute="top" id="HRF-cM-WDL"/>
@@ -1472,7 +1445,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="85Z-MR-kUV" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="0qo-8d-jei"/>
<constraint firstItem="PrH-u2-IEv" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="22S-vT-VQI"/>
@@ -1494,11 +1467,11 @@
<constraint firstItem="IX2-yp-0oa" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="vBX-Hr-mju"/>
</constraints>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch">
- <rect key="frame" x="0.0" y="556" width="600" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch">
+ <frame key="frameInset" minY="556" width="600" height="44"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fB1-w2-lJI">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fB1-w2-lJI">
+ <frame key="frameInset" width="600" height="44"/>
<inset key="contentEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Simple Mode"/>
<userDefinedRuntimeAttributes>
@@ -1511,8 +1484,8 @@
<action selector="toggleMode" destination="Ld6-gM-2hk" eventType="touchUpInside" id="W6C-Sh-gzz"/>
</connections>
</button>
- <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="z8F-55-5rJ">
- <rect key="frame" x="568" y="10" width="24" height="24"/>
+ <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="ic_arrow_gray_right" translatesAutoresizingMaskIntoConstraints="NO" id="z8F-55-5rJ">
+ <frame key="frameInset" minX="568" minY="10" width="24" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="24" id="ypP-17-bfX"/>
<constraint firstAttribute="height" constant="24" id="zE5-1N-qvh"/>
@@ -1521,8 +1494,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
</userDefinedRuntimeAttributes>
</imageView>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="onT-vv-01i">
- <rect key="frame" x="0.0" y="-1" width="600" height="1"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="onT-vv-01i">
+ <frame key="frameInset" minY="-1" width="600" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="UUW-c4-eNA"/>
</constraints>
@@ -1531,7 +1504,7 @@
</userDefinedRuntimeAttributes>
</imageView>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="onT-vv-01i" firstAttribute="top" secondItem="SZQ-ra-FC3" secondAttribute="top" constant="-1" id="0rP-2v-SID"/>
<constraint firstAttribute="bottom" secondItem="fB1-w2-lJI" secondAttribute="bottom" id="FuW-nL-fSI"/>
@@ -1549,7 +1522,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="SZQ-ra-FC3" firstAttribute="top" secondItem="aQv-7U-zAP" secondAttribute="bottom" id="14K-dW-WIs"/>
<constraint firstItem="SZQ-ra-FC3" firstAttribute="top" secondItem="X1H-IB-Nv1" secondAttribute="bottom" id="6NA-sm-uo7"/>
@@ -1593,15 +1566,15 @@
<viewControllerLayoutGuide type="bottom" id="ZGa-cz-Fmo"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="S9T-iq-RN6">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2p5-BG-sgS">
- <rect key="frame" x="0.0" y="40" width="600" height="88"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2p5-BG-sgS">
+ <frame key="frameInset" minY="40" width="600" height="88"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8t7-Lb-1dX" userLabel="Separator #1">
- <rect key="frame" x="0.0" y="0.0" width="600" height="1"/>
- <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8t7-Lb-1dX" userLabel="Separator #1">
+ <frame key="frameInset" width="600" height="1"/>
+ <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="UWu-iu-DyB"/>
</constraints>
@@ -1609,8 +1582,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
- <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NyD-Tz-Vq4">
- <rect key="frame" x="16" y="1" width="568" height="44"/>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NyD-Tz-Vq4">
+ <frame key="frameInset" minX="16" minY="1" width="568" height="44"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress"/>
<userDefinedRuntimeAttributes>
@@ -1624,9 +1597,9 @@
<outlet property="delegate" destination="4R7-Vk-fQr" id="koP-R3-XiP"/>
</connections>
</textField>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xl1-50-Vih" userLabel="Separator #2">
- <rect key="frame" x="16" y="44" width="584" height="1"/>
- <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xl1-50-Vih" userLabel="Separator #2">
+ <frame key="frameInset" minX="16" minY="44" width="584" height="1"/>
+ <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="vvu-MV-Pff"/>
</constraints>
@@ -1634,8 +1607,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
</userDefinedRuntimeAttributes>
</view>
- <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e51-Qs-t6a">
- <rect key="frame" x="16" y="44" width="568" height="44"/>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e51-Qs-t6a">
+ <frame key="frameInset" minX="16" minY="44" width="568" height="44"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES"/>
<userDefinedRuntimeAttributes>
@@ -1649,9 +1622,9 @@
<outlet property="delegate" destination="4R7-Vk-fQr" id="QBg-oI-jcp"/>
</connections>
</textField>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Dm-Lz-QG7" userLabel="Separator #3">
- <rect key="frame" x="0.0" y="87" width="600" height="1"/>
- <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Dm-Lz-QG7" userLabel="Separator #3">
+ <frame key="frameInset" minY="87" width="600" height="1"/>
+ <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="twL-Z5-mey"/>
</constraints>
@@ -1660,7 +1633,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="8Dm-Lz-QG7" firstAttribute="leading" secondItem="2p5-BG-sgS" secondAttribute="leading" id="1oq-bj-K40"/>
<constraint firstItem="8t7-Lb-1dX" firstAttribute="top" secondItem="2p5-BG-sgS" secondAttribute="top" id="7Od-uU-Q64"/>
@@ -1685,8 +1658,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QoF-Wv-nc2">
- <rect key="frame" x="16" y="148" width="568" height="44"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QoF-Wv-nc2">
+ <frame key="frameInset" minX="16" minY="148" width="568" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="g9P-gK-jg8"/>
</constraints>
@@ -1697,7 +1670,7 @@
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -1711,8 +1684,8 @@
<action selector="login" destination="4R7-Vk-fQr" eventType="touchUpInside" id="IIp-Wz-gj1"/>
</connections>
</button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dOX-WF-oyI">
- <rect key="frame" x="16" y="204" width="568" height="44"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dOX-WF-oyI">
+ <frame key="frameInset" minX="16" minY="204" width="568" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="SFg-uo-s0U"/>
</constraints>
@@ -1729,16 +1702,16 @@
<action selector="forgotPassword" destination="4R7-Vk-fQr" eventType="touchUpInside" id="AJW-6Y-s5F"/>
</connections>
</button>
- <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jMt-5d-INe">
- <rect key="frame" x="290" y="160" width="20" height="20"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view hidden="YES" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jMt-5d-INe">
+ <frame key="frameInset" minX="290" minY="160" width="20" height="20"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="9HJ-T7-PfS"/>
<constraint firstAttribute="width" constant="20" id="cgc-jq-2QK"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="jMt-5d-INe" firstAttribute="centerX" secondItem="QoF-Wv-nc2" secondAttribute="centerX" id="2Kv-5N-0Cj"/>
<constraint firstItem="2p5-BG-sgS" firstAttribute="top" secondItem="diV-OZ-JSc" secondAttribute="bottom" constant="20" id="4Ka-53-cIL"/>
@@ -1784,21 +1757,21 @@
<viewControllerLayoutGuide type="bottom" id="y41-VX-XhB"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="i64-CY-UO1">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S0n-BM-V4o" userLabel="Auth view">
- <rect key="frame" x="20" y="116" width="560" height="249"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S0n-BM-V4o" userLabel="Auth view">
+ <frame key="frameInset" minX="20" minY="116" width="560" height="249"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzz-yF-441">
- <rect key="frame" x="0.0" y="0.0" width="560" height="40"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tzz-yF-441">
+ <frame key="frameInset" width="560" height="40"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="sq5-AS-HML"/>
</constraints>
<string key="text">Войдите, чтобы ваши изменения увидели
другие пользователи</string>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
- <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
@@ -1806,15 +1779,15 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="login_to_make_edits_visible"/>
</userDefinedRuntimeAttributes>
</label>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MzH-tk-9iS" userLabel="Google btn">
- <rect key="frame" x="0.0" y="56" width="274" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MzH-tk-9iS" userLabel="Google btn">
+ <frame key="frameInset" minY="56" width="274" height="44"/>
<subviews>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cT8-b7-zTj">
- <rect key="frame" x="0.0" y="0.0" width="274" height="44"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cT8-b7-zTj">
+ <frame key="frameInset" width="274" height="44"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="titleEdgeInsets" minX="20" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Google">
- <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -1825,7 +1798,7 @@
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -1833,14 +1806,13 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_google" translatesAutoresizingMaskIntoConstraints="NO" id="VTY-T1-l6q">
- <rect key="frame" x="12" y="8" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="7sp-hE-lQy"/>
<constraint firstAttribute="height" constant="28" id="lYn-b1-63D"/>
</constraints>
</imageView>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="VTY-T1-l6q" firstAttribute="top" secondItem="MzH-tk-9iS" secondAttribute="top" constant="8" id="PSG-RC-UTK"/>
<constraint firstAttribute="height" constant="44" id="X9t-ER-03M"/>
@@ -1851,12 +1823,12 @@
<constraint firstItem="VTY-T1-l6q" firstAttribute="leading" secondItem="MzH-tk-9iS" secondAttribute="leading" constant="12" id="vUP-Ej-L30"/>
</constraints>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y6o-0o-dz7" userLabel="FB btn">
- <rect key="frame" x="286" y="56" width="274" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y6o-0o-dz7" userLabel="FB btn">
+ <frame key="frameInset" minX="286" minY="56" width="274" height="44"/>
<subviews>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U4B-pb-aFf">
- <rect key="frame" x="0.0" y="0.0" width="274" height="44"/>
- <color key="backgroundColor" red="0.026881167763157895" green="0.0" blue="0.93857935855263153" alpha="1" colorSpace="calibratedRGB"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U4B-pb-aFf">
+ <frame key="frameInset" width="274" height="44"/>
+ <color key="backgroundColor" red="0.026881167763157895" green="0.0" blue="0.93857935855263153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="titleEdgeInsets" minX="20" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Facebook"/>
<userDefinedRuntimeAttributes>
@@ -1868,7 +1840,7 @@
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
@@ -1876,14 +1848,13 @@
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_facebook" translatesAutoresizingMaskIntoConstraints="NO" id="bGN-fy-oFg">
- <rect key="frame" x="12" y="8" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="kNG-X2-lZ8"/>
<constraint firstAttribute="height" constant="28" id="vzD-Ed-9X7"/>
</constraints>
</imageView>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="bGN-fy-oFg" firstAttribute="top" secondItem="y6o-0o-dz7" secondAttribute="top" constant="8" id="LOd-HZ-bTJ"/>
<constraint firstAttribute="trailing" secondItem="U4B-pb-aFf" secondAttribute="trailing" id="aWL-hw-cpk"/>
@@ -1894,9 +1865,9 @@
<constraint firstAttribute="height" constant="44" id="zwq-5V-dGB"/>
</constraints>
</view>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gqm-JS-hos">
- <rect key="frame" x="0.0" y="112" width="560" height="44"/>
- <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gqm-JS-hos">
+ <frame key="frameInset" minY="112" width="560" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="BfT-9z-7iV"/>
</constraints>
@@ -1910,20 +1881,20 @@
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="loginOSM" destination="iZ6-Zi-bkZ" eventType="touchUpInside" id="U8A-dL-xzX"/>
</connections>
</button>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't have OpenStreetMap account?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhm-W1-U8A">
- <rect key="frame" x="0.0" y="180" width="560" height="17"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Don't have OpenStreetMap account?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhm-W1-U8A">
+ <frame key="frameInset" minY="180" width="560" height="17"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="ntS-Lm-ZFB"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -1931,8 +1902,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="no_osm_account"/>
</userDefinedRuntimeAttributes>
</label>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0p-dL-PG8">
- <rect key="frame" x="0.0" y="205" width="560" height="44"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0p-dL-PG8">
+ <frame key="frameInset" minY="205" width="560" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="4EG-ux-LH6"/>
</constraints>
@@ -1949,7 +1920,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="y6o-0o-dz7" firstAttribute="width" secondItem="MzH-tk-9iS" secondAttribute="width" id="0rS-To-gGZ"/>
<constraint firstAttribute="trailing" secondItem="nhm-W1-U8A" secondAttribute="trailing" id="1tj-If-gNH"/>
@@ -1972,21 +1943,21 @@
<constraint firstAttribute="trailing" secondItem="s0p-dL-PG8" secondAttribute="trailing" id="tZN-SO-5WH"/>
</constraints>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qZp-mj-lui" userLabel="Account view">
- <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qZp-mj-lui" userLabel="Account view">
+ <frame key="frameInset" minY="20" width="600" height="580"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WGF-rs-oH8" userLabel="Main view">
- <rect key="frame" x="0.0" y="0.0" width="600" height="212"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WGF-rs-oH8" userLabel="Main view">
+ <frame key="frameInset" width="600" height="212"/>
<subviews>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="−−−" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5mN-XO-0Df">
- <rect key="frame" x="16" y="32" width="568" height="114"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="−−−" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5mN-XO-0Df">
+ <frame key="frameInset" minX="16" minY="32" width="568" height="114"/>
<constraints>
<constraint firstAttribute="height" constant="114" id="LK9-Pd-uVa">
<variation key="heightClass=compact" constant="67"/>
</constraint>
</constraints>
<fontDescription key="fontDescription" type="boldSystem" pointSize="96"/>
- <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="whitePrimaryText"/>
@@ -1995,10 +1966,10 @@
<fontDescription key="fontDescription" type="boldSystem" pointSize="56"/>
</variation>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="VERIFIED CHANGES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="61G-Rv-3df">
- <rect key="frame" x="232" y="146" width="137" height="17"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="VERIFIED CHANGES" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="61G-Rv-3df">
+ <frame key="frameInset" minX="232" minY="146" width="137" height="17"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
- <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold14"/>
@@ -2006,10 +1977,10 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="editor_profile_changes"/>
</userDefinedRuntimeAttributes>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last send 12.01.2015" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UV-ZB-sPO">
- <rect key="frame" x="241" y="171" width="119" height="15"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Last send 12.01.2015" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2UV-ZB-sPO">
+ <frame key="frameInset" minX="241" minY="171" width="119" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
- <color key="textColor" red="1" green="1" blue="1" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="1" green="1" blue="1" alpha="0.40000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
@@ -2018,7 +1989,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="5mN-XO-0Df" firstAttribute="top" secondItem="WGF-rs-oH8" secondAttribute="top" constant="32" id="0K3-rp-7d2">
<variation key="heightClass=compact" constant="0.0"/>
@@ -2037,27 +2008,26 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="primary"/>
</userDefinedRuntimeAttributes>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7f3-Rm-QqW" userLabel="Detailed info">
- <rect key="frame" x="0.0" y="248" width="600" height="64"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7f3-Rm-QqW" userLabel="Detailed info">
+ <frame key="frameInset" minY="248" width="600" height="64"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wNF-fp-3SQ" userLabel="Separator1">
- <rect key="frame" x="0.0" y="0.0" width="600" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wNF-fp-3SQ" userLabel="Separator1">
+ <frame key="frameInset" width="600" height="1"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="xWE-J3-mMV"/>
</constraints>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-FZ-kms" userLabel="Separator2">
- <rect key="frame" x="0.0" y="63" width="600" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-FZ-kms" userLabel="Separator2">
+ <frame key="frameInset" minY="63" width="600" height="1"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="EB6-Py-4TW"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="−−−" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JuL-pe-mJl">
- <rect key="frame" x="16" y="16" width="52" height="32"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="27"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium28"/>
@@ -2065,9 +2035,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Place" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksi-Oz-YxU">
- <rect key="frame" x="84" y="12" width="83" height="21"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.87" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
@@ -2076,9 +2045,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Changes to the next place: −−−" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wuZ-au-bo9">
- <rect key="frame" x="84" y="35" width="204" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -2087,7 +2055,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Syo-FZ-kms" firstAttribute="leading" secondItem="7f3-Rm-QqW" secondAttribute="leading" id="4Ih-n3-JAB"/>
<constraint firstAttribute="trailing" secondItem="Syo-FZ-kms" secondAttribute="trailing" id="7fI-5Y-Zyg"/>
@@ -2108,8 +2076,8 @@
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="menuBackground"/>
</userDefinedRuntimeAttributes>
</view>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7m7-zW-Tcq">
- <rect key="frame" x="20" y="540" width="560" height="20"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="bottom" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7m7-zW-Tcq">
+ <frame key="frameInset" minX="20" minY="540" width="560" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Z6L-ma-g9a"/>
</constraints>
@@ -2125,7 +2093,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="WGF-rs-oH8" firstAttribute="leading" secondItem="qZp-mj-lui" secondAttribute="leading" id="49S-ia-ak6"/>
<constraint firstItem="WGF-rs-oH8" firstAttribute="top" secondItem="qZp-mj-lui" secondAttribute="top" id="F1A-oD-eOM"/>
@@ -2146,7 +2114,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="y41-VX-XhB" firstAttribute="top" secondItem="qZp-mj-lui" secondAttribute="bottom" id="11a-17-5z7"/>
<constraint firstItem="qZp-mj-lui" firstAttribute="top" secondItem="Yup-ms-er9" secondAttribute="bottom" id="1LV-nh-oGb"/>
@@ -2192,26 +2160,26 @@
<viewControllerLayoutGuide type="bottom" id="JzT-iz-MhU"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="2u2-L2-Hb3">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Iae-5m-9Z1">
- <rect key="frame" x="0.0" y="20" width="600" height="580"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <webView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Iae-5m-9Z1">
+ <frame key="frameInset" minY="20" width="600" height="580"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="delegate" destination="anB-7S-ebY" id="EDW-sZ-Oem"/>
</connections>
</webView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WWh-HK-7a5">
- <rect key="frame" x="280" y="290" width="40" height="40"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WWh-HK-7a5">
+ <frame key="frameInset" minX="280" minY="290" width="40" height="40"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="4e7-ir-1vf"/>
<constraint firstAttribute="height" constant="40" id="89f-2L-ZNe"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="WWh-HK-7a5" firstAttribute="centerY" secondItem="Iae-5m-9Z1" secondAttribute="centerY" id="4tD-Ed-qHk"/>
<constraint firstItem="Iae-5m-9Z1" firstAttribute="leading" secondItem="2u2-L2-Hb3" secondAttribute="leading" id="5mo-E8-9ix"/>
@@ -2235,29 +2203,29 @@
<objects>
<tableViewController id="ocL-kj-jxR" customClass="MWMEditorAdditionalNamesTableViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="tQ2-XI-QWd">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="JcK-nR-UGw" detailTextLabel="Cmi-x5-6Vt" style="IBUITableViewCellStyleSubtitle" id="RXe-xp-xlR" customClass="MWMTableViewCell">
- <rect key="frame" x="0.0" y="28" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RXe-xp-xlR" id="g0x-Vt-1FI">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JcK-nR-UGw">
- <rect key="frame" x="15" y="6" width="31" height="19"/>
+ <frame key="frameInset" minX="15" minY="5" width="32" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Cmi-x5-6Vt">
- <rect key="frame" x="15" y="25" width="30" height="13"/>
+ <frame key="frameInset" minX="15" minY="25" width="31" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@@ -2279,9 +2247,9 @@
<objects>
<tableViewController id="Heu-QR-M0N" customClass="MWMStreetEditorViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="rJJ-UB-6u2">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="scrollIndicatorInsets" minX="0.0" minY="44" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="dataSource" destination="Heu-QR-M0N" id="TzF-Rz-ZsY"/>
@@ -2302,12 +2270,12 @@
<viewControllerLayoutGuide type="bottom" id="Ugs-ZC-gWI"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="MIY-NW-Joh">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="JbV-y9-HBo">
- <rect key="frame" x="0.0" y="64" width="600" height="536"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="JbV-y9-HBo">
+ <frame key="frameInset" minY="64" width="600" height="536"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
@@ -2316,10 +2284,10 @@
<outlet property="delegate" destination="QlF-CJ-cEG" id="QFe-QZ-zDw"/>
</connections>
</tableView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rI9-RR-sKP" userLabel="Status Bar Background">
- <rect key="frame" x="0.0" y="-44" width="600" height="108"/>
- <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
- <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rI9-RR-sKP" userLabel="Status Bar Background">
+ <frame key="frameInset" minY="-44" width="600" height="108"/>
+ <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="108" id="Qw2-w6-Efn"/>
</constraints>
@@ -2329,7 +2297,7 @@
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
@@ -2339,20 +2307,20 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
- <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="gzF-B7-8pj">
- <rect key="frame" x="0.0" y="20" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <searchBar contentMode="redraw" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gzF-B7-8pj">
+ <frame key="frameInset" minY="20" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="2uI-k6-ahr"/>
</constraints>
- <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="QlF-CJ-cEG" id="E9l-Dh-dkk"/>
</connections>
</searchBar>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="gzF-B7-8pj" secondAttribute="trailing" id="05P-0L-iQz"/>
<constraint firstItem="rI9-RR-sKP" firstAttribute="leading" secondItem="gzF-B7-8pj" secondAttribute="leading" id="5UI-FH-LNP"/>
@@ -2388,12 +2356,12 @@
<viewControllerLayoutGuide type="bottom" id="rCY-6D-3pn"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="iTG-qE-svw">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="ina-WD-kps">
- <rect key="frame" x="0.0" y="64" width="600" height="536"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="ina-WD-kps">
+ <frame key="frameInset" minY="64" width="600" height="536"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
</userDefinedRuntimeAttributes>
@@ -2402,10 +2370,10 @@
<outlet property="delegate" destination="da4-KT-kzF" id="eGp-vV-hCr"/>
</connections>
</tableView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HEU-Bu-3wh" userLabel="Status Bar Background">
- <rect key="frame" x="0.0" y="-44" width="600" height="108"/>
- <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
- <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HEU-Bu-3wh" userLabel="Status Bar Background">
+ <frame key="frameInset" minY="-44" width="600" height="108"/>
+ <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="108" id="Slm-73-UcI"/>
</constraints>
@@ -2415,7 +2383,7 @@
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
@@ -2425,20 +2393,20 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
- <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="z6s-26-dP6">
- <rect key="frame" x="0.0" y="20" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <searchBar contentMode="redraw" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z6s-26-dP6">
+ <frame key="frameInset" minY="20" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="UAk-z1-2EY"/>
</constraints>
- <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="da4-KT-kzF" id="y0G-ow-KBN"/>
</connections>
</searchBar>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="HEU-Bu-3wh" firstAttribute="trailing" secondItem="z6s-26-dP6" secondAttribute="trailing" id="0u3-Xq-8ad"/>
<constraint firstItem="HEU-Bu-3wh" firstAttribute="leading" secondItem="z6s-26-dP6" secondAttribute="leading" id="3YU-aS-Hgr"/>
@@ -2473,12 +2441,12 @@
<viewControllerLayoutGuide type="bottom" id="IsM-zL-XdT"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="XQZ-0V-SyR">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="CwW-x8-G3j">
- <rect key="frame" x="0.0" y="64" width="600" height="536"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="CwW-x8-G3j">
+ <frame key="frameInset" minY="64" width="600" height="536"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
@@ -2488,21 +2456,21 @@
<outletCollection property="gestureRecognizers" destination="huu-3c-diL" appends="YES" id="h7R-bq-lcB"/>
</connections>
</tableView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="st5-ZJ-F0A" userLabel="UpdateAllView">
- <rect key="frame" x="0.0" y="556" width="600" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="st5-ZJ-F0A" userLabel="UpdateAllView">
+ <frame key="frameInset" minY="556" width="600" height="44"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0aj-pt-FjD">
- <rect key="frame" x="0.0" y="0.0" width="600" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0aj-pt-FjD">
+ <frame key="frameInset" width="600" height="1"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="1" id="6LI-Em-15P"/>
</constraints>
</view>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GN0-2F-Ytz" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
- <color key="backgroundColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GN0-2F-Ytz" customClass="MWMButton">
+ <frame key="frameInset" width="600" height="44"/>
+ <color key="backgroundColor" red="0.034757062792778015" green="0.31522077322006226" blue="0.81491315364837646" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="Update All">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -2515,11 +2483,11 @@
<action selector="allMapsAction" destination="h4a-ne-bSJ" eventType="touchUpInside" id="swH-BL-Egj"/>
</connections>
</button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bQM-6x-WHa" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bQM-6x-WHa" customClass="MWMButton">
+ <frame key="frameInset" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="Update All">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -2530,7 +2498,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="GN0-2F-Ytz" secondAttribute="bottom" id="1d7-Jm-x6G"/>
<constraint firstAttribute="trailing" secondItem="GN0-2F-Ytz" secondAttribute="trailing" id="Fla-om-Cu2"/>
@@ -2555,10 +2523,10 @@
</mask>
</variation>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xxz-fq-71r" userLabel="Status Bar Background">
- <rect key="frame" x="0.0" y="-44" width="600" height="108"/>
- <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
- <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xxz-fq-71r" userLabel="Status Bar Background">
+ <frame key="frameInset" minY="-44" width="600" height="108"/>
+ <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="108" id="9ZH-dO-Jna"/>
</constraints>
@@ -2568,7 +2536,7 @@
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
@@ -2578,26 +2546,26 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
- <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="DPt-gs-efn">
- <rect key="frame" x="0.0" y="20" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <searchBar contentMode="redraw" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DPt-gs-efn">
+ <frame key="frameInset" minY="20" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="9M7-y1-RSU"/>
</constraints>
- <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="barTintColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<textInputTraits key="textInputTraits"/>
<connections>
<outlet property="delegate" destination="h4a-ne-bSJ" id="k3P-rj-vcL"/>
</connections>
</searchBar>
- <containerView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kXO-Oh-2vO" userLabel="No Maps Container View">
- <rect key="frame" x="0.0" y="64" width="600" height="536"/>
+ <containerView hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kXO-Oh-2vO" userLabel="No Maps Container View">
+ <frame key="frameInset" minY="64" width="600" height="536"/>
<connections>
<segue destination="3el-Zi-2E4" kind="embed" identifier="MapDownloaderEmbedNoMapsSegue" id="ish-dC-mkH"/>
</connections>
</containerView>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<constraints>
<constraint firstAttribute="trailing" secondItem="CwW-x8-G3j" secondAttribute="trailing" id="6QL-v4-rNy"/>
@@ -2651,12 +2619,12 @@
<viewControllerLayoutGuide type="bottom" id="pwj-zO-3dZ"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="uK4-o2-eLJ">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="bgs-Kf-cQA">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="bgs-Kf-cQA">
+ <frame key="frameInset" width="600" height="600"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
@@ -2666,21 +2634,21 @@
<outletCollection property="gestureRecognizers" destination="u47-DA-0Sa" appends="YES" id="U3g-pC-K4D"/>
</connections>
</tableView>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9vd-CW-37q" userLabel="UpdateAllView">
- <rect key="frame" x="0.0" y="556" width="600" height="44"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9vd-CW-37q" userLabel="UpdateAllView">
+ <frame key="frameInset" minY="556" width="600" height="44"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C2D-Ac-wjh">
- <rect key="frame" x="0.0" y="0.0" width="600" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="C2D-Ac-wjh">
+ <frame key="frameInset" width="600" height="1"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="1" id="77N-Bp-ThF"/>
</constraints>
</view>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xL5-0u-TaG" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
- <color key="backgroundColor" name="alternateSelectedControlColor" catalog="System" colorSpace="catalog"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xL5-0u-TaG" customClass="MWMButton">
+ <frame key="frameInset" width="600" height="44"/>
+ <color key="backgroundColor" red="0.034757062792778015" green="0.31522077322006226" blue="0.81491315364837646" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="Download All">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -2693,11 +2661,11 @@
<action selector="allMapsAction" destination="ccD-FK-8j5" eventType="touchUpInside" id="EtQ-2G-MEd"/>
</connections>
</button>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MmB-HW-cD5" customClass="MWMButton">
- <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MmB-HW-cD5" customClass="MWMButton">
+ <frame key="frameInset" width="600" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<state key="normal" title="Download All">
- <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -2708,7 +2676,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="C2D-Ac-wjh" firstAttribute="leading" secondItem="9vd-CW-37q" secondAttribute="leading" id="00a-wh-BaK"/>
<constraint firstItem="xL5-0u-TaG" firstAttribute="top" secondItem="9vd-CW-37q" secondAttribute="top" id="6ui-Df-HR9"/>
@@ -2733,9 +2701,9 @@
</mask>
</variation>
</view>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JpS-Fh-epm" userLabel="Shadow layer">
- <rect key="frame" x="0.0" y="20" width="600" height="1"/>
- <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JpS-Fh-epm" userLabel="Shadow layer">
+ <frame key="frameInset" minY="20" width="600" height="1"/>
+ <color key="backgroundColor" red="0.1215686275" green="0.59999999999999998" blue="0.32156862749999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="X2f-X2-VS5"/>
</constraints>
@@ -2745,7 +2713,7 @@
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.shadowUIColor">
- <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="calibratedRGB"/>
+ <color key="value" red="0.0" green="0.0" blue="0.0" alpha="0.23999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="layer.shadowOpacity">
<integer key="value" value="1"/>
@@ -2756,7 +2724,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="9vd-CW-37q" secondAttribute="trailing" id="3T4-vx-sKV"/>
<constraint firstItem="bgs-Kf-cQA" firstAttribute="leading" secondItem="uK4-o2-eLJ" secondAttribute="leading" id="8gX-1F-KTf"/>
@@ -2809,16 +2777,12 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gmw-e3-n53" userLabel="Container" customClass="MWMNoMapsView">
- <rect key="frame" x="97" y="0.0" width="407" height="536"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dCZ-PN-2Ob" userLabel="BoundsView">
- <rect key="frame" x="16" y="0.0" width="375" height="432"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="87G-jh-N8H" userLabel="CenteredView">
- <rect key="frame" x="0.0" y="91" width="375" height="249"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_no_maps" translatesAutoresizingMaskIntoConstraints="NO" id="vI9-fc-FO2">
- <rect key="frame" x="108" y="0.0" width="160" height="160"/>
<constraints>
<constraint firstAttribute="width" secondItem="vI9-fc-FO2" secondAttribute="height" multiplier="1:1" id="f4J-1R-ewM"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="160" id="jwh-bM-u0p"/>
@@ -2826,9 +2790,8 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="У вас нет загруженных карт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="abh-G0-Alr" userLabel="Title">
- <rect key="frame" x="0.0" y="180" width="375" height="24"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -2837,9 +2800,8 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaW-Ad-mYI" userLabel="Text">
- <rect key="frame" x="0.0" y="216" width="375" height="33"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -2848,7 +2810,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstItem="LaW-Ad-mYI" firstAttribute="top" secondItem="abh-G0-Alr" secondAttribute="bottom" priority="750" constant="12" id="33n-qj-bSE"/>
@@ -2867,7 +2829,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="87G-jh-N8H" firstAttribute="height" relation="lessThanOrEqual" secondItem="dCZ-PN-2Ob" secondAttribute="height" id="3ke-l5-5ex"/>
@@ -2878,15 +2840,14 @@
</constraints>
</view>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Moj-UK-oyl" userLabel="DownloadMaps" customClass="MWMButton">
- <rect key="frame" x="84" y="452" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="49x-bx-JJj"/>
<constraint firstAttribute="height" constant="44" id="k3P-mC-aLM"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" image="ic_add_button">
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -2904,7 +2865,7 @@
</connections>
</button>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="vI9-fc-FO2" firstAttribute="height" secondItem="Gmw-e3-n53" secondAttribute="height" multiplier="0.3" priority="750" id="5LE-Rt-OXk"/>
<constraint firstAttribute="trailing" secondItem="dCZ-PN-2Ob" secondAttribute="trailing" constant="16" id="BYs-UF-Vjh"/>
@@ -2932,7 +2893,7 @@
</connections>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Gmw-e3-n53" firstAttribute="width" relation="lessThanOrEqual" secondItem="4WP-vj-Alg" secondAttribute="width" id="IPr-ei-Pbl"/>
<constraint firstItem="Gmw-e3-n53" firstAttribute="centerY" secondItem="4WP-vj-Alg" secondAttribute="centerY" priority="750" id="X4Z-4D-lqR"/>
@@ -2958,30 +2919,30 @@
<viewControllerLayoutGuide type="bottom" id="S6g-Zb-x8d"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="C6V-Ws-Uzs" customClass="MWMMigrationView">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Toe-vk-Vmp" userLabel="Container">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Toe-vk-Vmp" userLabel="Container">
+ <frame key="frameInset" width="600" height="600"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OC0-ml-Jn7" userLabel="BoundsView">
- <rect key="frame" x="16" y="36" width="568" height="366"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OC0-ml-Jn7" userLabel="BoundsView">
+ <frame key="frameInset" minX="16" minY="36" width="568" height="366"/>
<subviews>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6hj-bQ-tcL" userLabel="CenteredView">
- <rect key="frame" x="84" y="17" width="400" height="333"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6hj-bQ-tcL" userLabel="CenteredView">
+ <frame key="frameInset" minX="84" minY="17" width="400" height="333"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" image="img_whatsnew_migration" translatesAutoresizingMaskIntoConstraints="NO" id="tap-L1-zYH">
- <rect key="frame" x="100" y="0.0" width="200" height="200"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" misplaced="YES" image="img_whatsnew_migration" translatesAutoresizingMaskIntoConstraints="NO" id="tap-L1-zYH">
+ <frame key="frameInset" minX="100" width="200" height="200"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="800" constant="130" id="fte-fp-Qz4"/>
<constraint firstAttribute="width" secondItem="tap-L1-zYH" secondAttribute="height" multiplier="1:1" id="msK-gB-JPG"/>
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="800" constant="200" id="oFQ-vg-Jr0"/>
</constraints>
</imageView>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Вы долго просили — мы наконец сделали!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="X9a-dw-9YW" userLabel="Title">
- <rect key="frame" x="0.0" y="220" width="400" height="48"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Вы долго просили — мы наконец сделали!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="X9a-dw-9YW" userLabel="Title">
+ <frame key="frameInset" minY="220" width="400" height="48"/>
<fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium18"/>
@@ -2989,10 +2950,10 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="whatsnew_smallmwm_header"/>
</userDefinedRuntimeAttributes>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мы поделили большие карты на маленькие части. Обновите данные и загружайте карту только нужного района." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="QK7-Vw-qwk" userLabel="Text">
- <rect key="frame" x="0.0" y="284" width="400" height="49"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Мы поделили большие карты на маленькие части. Обновите данные и загружайте карту только нужного района." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="QK7-Vw-qwk" userLabel="Text">
+ <frame key="frameInset" minY="284" width="400" height="49"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -3001,7 +2962,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="CenteredView"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="Bcf-ou-ljt"/>
@@ -3018,7 +2979,7 @@
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="BoundsView"/>
<constraints>
<constraint firstItem="6hj-bQ-tcL" firstAttribute="height" relation="lessThanOrEqual" secondItem="OC0-ml-Jn7" secondAttribute="height" id="Gdk-pa-yBO"/>
@@ -3028,28 +2989,28 @@
<constraint firstItem="6hj-bQ-tcL" firstAttribute="leading" secondItem="OC0-ml-Jn7" secondAttribute="leading" priority="999" id="cdG-n6-Mnq"/>
</constraints>
</view>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Для обновления требуется больше свободного места. Пожалуйста, удалите ненужный контент." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="9dB-cn-qbb" userLabel="State">
- <rect key="frame" x="100" y="433" width="400" height="33"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Для обновления требуется больше свободного места. Пожалуйста, удалите ненужный контент." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="9dB-cn-qbb" userLabel="State">
+ <frame key="frameInset" minX="100" minY="433" width="400" height="33"/>
<constraints>
<constraint firstAttribute="width" priority="750" constant="400" id="gnK-Ra-PzL"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4zz-rI-p8s">
- <rect key="frame" x="180" y="482" width="240" height="44"/>
- <color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4zz-rI-p8s">
+ <frame key="frameInset" minX="180" minY="482" width="240" height="44"/>
+ <color key="backgroundColor" red="0.12549019610000001" green="0.58823529409999997" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="240" id="X1V-eT-w7Y"/>
<constraint firstAttribute="height" constant="44" id="cFJ-Fl-WbP"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
<state key="normal" title="Update All Maps">
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -3065,17 +3026,17 @@
<action selector="primaryAction" destination="ZNV-s3-dag" eventType="touchUpInside" id="79r-AU-CFo"/>
</connections>
</button>
- <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="7bw-ZT-3ea">
- <rect key="frame" x="180" y="536" width="240" height="44"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="7bw-ZT-3ea">
+ <frame key="frameInset" minX="180" minY="536" width="240" height="44"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="CAj-eV-2O5"/>
<constraint firstAttribute="width" constant="240" id="WDx-tN-JRi"/>
</constraints>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
<state key="normal" title="Скачать текущую и удалить все старые карты">
- <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleColor" red="0.01176470588" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
@@ -3087,16 +3048,16 @@
<action selector="secondaryAction" destination="ZNV-s3-dag" eventType="touchUpInside" id="wKE-Oh-RQ7"/>
</connections>
</button>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3d5-wL-CHn">
- <rect key="frame" x="282" y="528" width="36" height="36"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3d5-wL-CHn">
+ <frame key="frameInset" minX="282" minY="528" width="36" height="36"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="0zQ-BH-f0O"/>
<constraint firstAttribute="width" constant="36" id="7rB-qH-hqN"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<accessibility key="accessibilityConfiguration" identifier="ContainerView"/>
<constraints>
<constraint firstItem="9dB-cn-qbb" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Toe-vk-Vmp" secondAttribute="leading" priority="750" constant="12" id="4Wc-7I-5xu"/>
@@ -3129,7 +3090,7 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="9dB-cn-qbb" firstAttribute="centerX" secondItem="C6V-Ws-Uzs" secondAttribute="centerX" id="ENX-6x-CjN"/>
<constraint firstItem="Toe-vk-Vmp" firstAttribute="centerY" secondItem="C6V-Ws-Uzs" secondAttribute="centerY" id="IFQ-Op-9ay"/>
@@ -3164,23 +3125,23 @@
<objects>
<tableViewController id="Ww0-88-Jrd" customClass="MWMUnitsController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="PRO-Nm-3ZN">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
<tableViewSection id="YbY-TG-Fq9">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="233-Ku-OFh" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="35" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="35" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="233-Ku-OFh" id="Tig-SC-0oN">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Километры" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="m0T-TK-aex">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Километры" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="m0T-TK-aex">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3201,16 +3162,16 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="XGu-p4-IVy" customClass="SelectableCell">
- <rect key="frame" x="0.0" y="79" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="79" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XGu-p4-IVy" id="c5A-yh-Pec">
- <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+ <frame key="frameInset" width="375" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Мили" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="xrt-1n-szu">
- <rect key="frame" x="16" y="11" width="566" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Мили" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="xrt-1n-szu">
+ <frame key="frameInset" minX="16" minY="11" width="566" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3256,17 +3217,17 @@
<viewControllerLayoutGuide type="bottom" id="PYx-r3-br5"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="tkX-wI-s7n">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Eg-lz-6TT">
- <rect key="frame" x="0.0" y="556" width="600" height="44"/>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="calibratedRGB"/>
+ <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Eg-lz-6TT">
+ <frame key="frameInset" minY="556" width="600" height="44"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="l2j-bd-ouL"/>
</constraints>
<state key="normal" title="Сообщить о проблеме">
- <color key="titleColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="titleColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
@@ -3276,15 +3237,15 @@
<action selector="reportBug" destination="f2i-mO-skH" eventType="touchUpInside" id="vzf-gV-Yag"/>
</connections>
</button>
- <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-mR-y8b">
- <rect key="frame" x="0.0" y="555" width="600" height="1"/>
- <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
+ <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-mR-y8b">
+ <frame key="frameInset" minY="555" width="600" height="1"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ban-XF-pOT"/>
</constraints>
</view>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="5Eg-lz-6TT" firstAttribute="top" secondItem="Kpm-mR-y8b" secondAttribute="bottom" id="ADY-Nc-qy2"/>
<constraint firstItem="Kpm-mR-y8b" firstAttribute="trailing" secondItem="5Eg-lz-6TT" secondAttribute="trailing" id="REe-oS-uoD"/>
@@ -3307,50 +3268,50 @@
<objects>
<tableViewController id="WyW-ez-gUy" customClass="MWMAboutController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="sUF-VC-Odx">
- <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<sections>
<tableViewSection id="Fph-fY-iFA">
<cells>
<tableViewCell userInteractionEnabled="NO" contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" shouldIndentWhileEditing="NO" rowHeight="288" id="NuJ-GM-bcI">
- <rect key="frame" x="0.0" y="0.0" width="600" height="288"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="288"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NuJ-GM-bcI" id="qiT-1S-zCI">
- <rect key="frame" x="0.0" y="0.0" width="600" height="287"/>
+ <frame key="frameInset" width="375" height="287"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Zod-2W-e52">
- <rect key="frame" x="240" y="24" width="120" height="120"/>
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="imgLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Zod-2W-e52">
+ <frame key="frameInset" minX="240" minY="24" width="120" height="120"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="8Wn-gp-DhZ"/>
<constraint firstAttribute="height" constant="120" id="Fq0-CZ-Odf"/>
</constraints>
</imageView>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Версия 6.3.0.318" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pep-ab-9Cl">
- <rect key="frame" x="232" y="156" width="137" height="21"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Версия 6.3.0.318" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pep-ab-9Cl">
+ <frame key="frameInset" minX="232" minY="156" width="137" height="21"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium17"/>
</userDefinedRuntimeAttributes>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Дата 16.08.2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xyg-86-TRB">
- <rect key="frame" x="250" y="181" width="101" height="16"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Дата 16.08.2016" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xyg-86-TRB">
+ <frame key="frameInset" minX="250" minY="181" width="101" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular13"/>
</userDefinedRuntimeAttributes>
</label>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHJ-Fo-pcY">
- <rect key="frame" x="16" y="205" width="568" height="32"/>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Объединив усилия Mail.Ru Group и данные OpenStreetMap, мы создаем незаменимое приложение для путешествий." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHJ-Fo-pcY">
+ <frame key="frameInset" minX="16" minY="205" width="568" height="32"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3359,7 +3320,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Pep-ab-9Cl" firstAttribute="centerX" secondItem="qiT-1S-zCI" secondAttribute="centerX" id="36J-AL-49K"/>
<constraint firstItem="Zod-2W-e52" firstAttribute="top" secondItem="qiT-1S-zCI" secondAttribute="top" constant="24" id="5FL-I9-xzk"/>
@@ -3372,21 +3333,21 @@
<constraint firstItem="xyg-86-TRB" firstAttribute="top" secondItem="Pep-ab-9Cl" secondAttribute="bottom" constant="4" id="uu4-DB-gyq"/>
</constraints>
</tableViewCellContentView>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
- <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+ <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="WfS-iR-EYh" customClass="LinkCell">
- <rect key="frame" x="0.0" y="288" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="288" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WfS-iR-EYh" id="pud-iP-cPv">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Веб-сайт" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="dRQ-jj-BMn">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Веб-сайт" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="dRQ-jj-BMn">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3407,16 +3368,16 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="orf-4x-6qF" customClass="LinkCell">
- <rect key="frame" x="0.0" y="332" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="332" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="orf-4x-6qF" id="HLu-xY-s47">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Блог" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="Usf-eP-UhD">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Блог" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="Usf-eP-UhD">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3437,16 +3398,16 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="AwY-rw-AMm" customClass="LinkCell">
- <rect key="frame" x="0.0" y="376" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="376" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AwY-rw-AMm" id="AUp-Ql-usV">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Facebook" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="VRr-XH-vvX">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Facebook" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="VRr-XH-vvX">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3467,16 +3428,16 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="PYl-5B-hBB" customClass="LinkCell">
- <rect key="frame" x="0.0" y="420" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="420" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PYl-5B-hBB" id="99g-g6-dgY">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Twitter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="snB-CD-ffn">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Twitter" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="snB-CD-ffn">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3497,16 +3458,16 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="q9S-xP-Mmy" customClass="LinkCell">
- <rect key="frame" x="0.0" y="464" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="464" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q9S-xP-Mmy" id="itl-Sl-h7g">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Подписаться на новости" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="1mC-fY-VIc">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Подписаться на новости" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="1mC-fY-VIc">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3528,14 +3489,14 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" rowHeight="36" id="ad4-no-N8I">
- <rect key="frame" x="0.0" y="508" width="600" height="36"/>
+ <rect key="frame" x="0.0" y="508" width="375" height="36"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ad4-no-N8I" id="oY2-Un-E4E">
- <rect key="frame" x="0.0" y="0.0" width="600" height="35"/>
+ <frame key="frameInset" width="375" height="35"/>
<autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableViewCellContentView>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</tableViewCell>
</cells>
@@ -3543,16 +3504,16 @@
<tableViewSection id="wsr-ZV-X15">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="jhU-Ha-kE2" customClass="LinkCell">
- <rect key="frame" x="0.0" y="544" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="544" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jhU-Ha-kE2" id="BJb-8F-OEp">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Оценить приложение" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="Spi-mD-g8U">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Оценить приложение" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="Spi-mD-g8U">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3574,14 +3535,14 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" rowHeight="36" id="fLn-sP-Mk4">
- <rect key="frame" x="0.0" y="588" width="600" height="36"/>
+ <rect key="frame" x="0.0" y="588" width="375" height="36"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fLn-sP-Mk4" id="cld-GE-cEX">
- <rect key="frame" x="0.0" y="0.0" width="600" height="35"/>
+ <frame key="frameInset" width="375" height="35"/>
<autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableViewCellContentView>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</tableViewCell>
</cells>
@@ -3589,16 +3550,16 @@
<tableViewSection id="Vce-Ld-skc">
<cells>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="VXa-CM-OXP" customClass="LinkCell">
- <rect key="frame" x="0.0" y="624" width="600" height="44"/>
+ <rect key="frame" x="0.0" y="624" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VXa-CM-OXP" id="Vot-vJ-3MU">
- <rect key="frame" x="0.0" y="0.0" width="567" height="43"/>
+ <frame key="frameInset" width="342" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="uhV-at-6HM">
- <rect key="frame" x="16" y="11" width="533" height="21"/>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Copyright" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="477" translatesAutoresizingMaskIntoConstraints="NO" id="uhV-at-6HM">
+ <frame key="frameInset" minX="16" minY="11" width="533" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
- <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
@@ -3620,14 +3581,14 @@
</userDefinedRuntimeAttributes>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="0.0" rowHeight="36" id="R7v-I1-M6P">
- <rect key="frame" x="0.0" y="668" width="600" height="36"/>
+ <rect key="frame" x="0.0" y="668" width="375" height="36"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R7v-I1-M6P" id="MVJ-em-dnd">
- <rect key="frame" x="0.0" y="0.0" width="600" height="35"/>
+ <frame key="frameInset" width="375" height="35"/>
<autoresizingMask key="autoresizingMask"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
</tableViewCellContentView>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<inset key="separatorInset" minX="10000" minY="0.0" maxX="0.0" maxY="0.0"/>
</tableViewCell>
</cells>
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/main.mm b/iphone/Maps/main.mm
index 52343944e9..cd72cd2f24 100644
--- a/iphone/Maps/main.mm
+++ b/iphone/Maps/main.mm
@@ -37,9 +37,15 @@ void setMarketingSender()
if (tag.empty())
return;
NSMutableDictionary<NSString *, NSString *> * eventParams = [@{} mutableCopy];
+ NSMutableString * myTrackerEvent = [@(tag.c_str()) mutableCopy];
for (auto const & param : params)
- eventParams[@(param.first.c_str())] = @(param.second.c_str());
- [MRMyTracker trackEvent:@(tag.c_str()) eventParams:eventParams];
+ {
+ NSString * key = @(param.first.c_str());
+ NSString * value = @(param.second.c_str());
+ eventParams[key] = value;
+ [myTrackerEvent appendString:[NSString stringWithFormat:@"_%@_%@", key, value]];
+ }
+ [MRMyTracker trackEvent:myTrackerEvent eventParams:nil];
});
}
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 間飯店。";
diff --git a/map/framework.cpp b/map/framework.cpp
index 7290d056d1..665f39ac8f 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -375,6 +375,7 @@ Framework::Framework()
auto const routingStatisticsFn = [](map<string, string> const & statistics)
{
alohalytics::LogEvent("Routing_CalculatingRoute", statistics);
+ GetPlatform().SendMarketingEvent("Routing_CalculatingRoute", {});
};
#ifdef DEBUG
auto const routingVisualizerFn = [this](m2::PointD const & pt)
@@ -636,6 +637,7 @@ void Framework::LoadBookmarks()
size_t Framework::AddBookmark(size_t categoryIndex, const m2::PointD & ptOrg, BookmarkData & bm)
{
+ GetPlatform().SendMarketingEvent("Bookmarks_Bookmark_action", {{"action", "create"}});
return m_bmManager.AddBookmark(categoryIndex, ptOrg, bm);
}
@@ -1600,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();
}
}
@@ -1985,6 +1983,9 @@ void Framework::OnTapEvent(TapEvent const & tapEvent)
kv["types"] = DebugPrint(info.GetTypes());
// Older version of statistics used "$GetUserMark" event.
alohalytics::Stats::Instance().LogEvent("$SelectMapObject", kv, alohalytics::Location::FromLatLon(ll.lat, ll.lon));
+
+ if (info.IsHotel())
+ GetPlatform().SendMarketingEvent("Placepage_Hotel_book", {{"provider", "booking.com"}});
}
ActivateMapSelection(true, selection, info);
@@ -2787,6 +2788,8 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
if (!mwmId.IsAlive())
return false;
+ GetPlatform().SendMarketingEvent("EditorAdd_start", {});
+
search::ReverseGeocoder const coder(m_model.GetIndex());
vector<search::ReverseGeocoder::Street> streets;
@@ -2808,6 +2811,8 @@ bool Framework::GetEditableMapObject(FeatureID const & fid, osm::EditableMapObje
if (!GetFeatureByID(fid, ft))
return false;
+ GetPlatform().SendMarketingEvent("EditorEdit_start", {});
+
emo.SetFromFeatureType(ft);
emo.SetHouseNumber(ft.GetHouseNumber());
auto const & editor = osm::Editor::Instance();
diff --git a/routing/routing_integration_tests/osrm_route_test.cpp b/routing/routing_integration_tests/osrm_route_test.cpp
index c13c2d9e65..33d783fa88 100644
--- a/routing/routing_integration_tests/osrm_route_test.cpp
+++ b/routing/routing_integration_tests/osrm_route_test.cpp
@@ -281,4 +281,22 @@ namespace
TEST_EQUAL(result, IRouter::NoError, ());
TEST_LESS(route.GetTotalTimeSec(), numeric_limits<uint32_t>::max() / 2, ());
}
+
+ // 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 items of |segments| vector could have an empty
+ // |m_path|. This test shows such case.
+ // UNIT_TEST(RussiaSpbPloschadBekhterevaToKomendantskiyProspekt)
+ // {
+ // TRouteResult const routeResult = integration::CalculateRoute(
+ // integration::GetOsrmComponents(), MercatorBounds::FromLatLon(59.90126, 30.39970), {0.,
+ // 0.},
+ // MercatorBounds::FromLatLon(60.02499, 30.23889));
+
+ // Route const & route = *routeResult.first;
+ // IRouter::ResultCode const result = routeResult.second;
+ // TEST_EQUAL(result, IRouter::NoError, ());
+
+ // integration::TestRouteTime(route, 1364.0);
+ // }
} // namespace
diff --git a/routing/routing_tests/turns_generator_test.cpp b/routing/routing_tests/turns_generator_test.cpp
index c52d20aead..f55e296d9a 100644
--- a/routing/routing_tests/turns_generator_test.cpp
+++ b/routing/routing_tests/turns_generator_test.cpp
@@ -4,8 +4,9 @@
#include "routing/turns.hpp"
#include "routing/turns_generator.hpp"
-#include "geometry/mercator.hpp"
+#include "indexer/ftypes_matcher.hpp"
+#include "geometry/mercator.hpp"
#include "geometry/point2d.hpp"
#include "std/cmath.hpp"
@@ -322,4 +323,40 @@ UNIT_TEST(TestCalculateMercatorDistanceAlongRoute)
TEST_EQUAL(CalculateMercatorDistanceAlongPath(1, 2, points), 0., ());
TEST_EQUAL(CalculateMercatorDistanceAlongPath(0, 1, points), 1., ());
}
+
+UNIT_TEST(TestCheckUTurnOnRoute)
+{
+ TUnpackedPathSegments pathSegments(4);
+ pathSegments[0].m_name = "A road";
+ pathSegments[0].m_weight = 1;
+ pathSegments[0].m_nodeId = 0;
+ pathSegments[0].m_highwayClass = ftypes::HighwayClass::Trunk;
+ pathSegments[0].m_onRoundabout = false;
+ pathSegments[0].m_isLink = false;
+ pathSegments[0].m_path = {{{0, 0}, 0}, {{0, 1}, 0}};
+
+ pathSegments[1] = pathSegments[0];
+ pathSegments[1].m_nodeId = 1;
+ pathSegments[1].m_path = {{{0, 1}, 0}, {{0, 0}, 0}};
+
+ pathSegments[2] = pathSegments[0];
+ pathSegments[2].m_nodeId = 2;
+ pathSegments[2].m_path = {{{0, 0}, 0}, {{0, 1}, 0}};
+
+ pathSegments[3] = pathSegments[0];
+ pathSegments[3].m_nodeId = 3;
+ pathSegments[3].m_path.clear();
+
+ // Zigzag test.
+ TurnItem turn1;
+ TEST_EQUAL(CheckUTurnOnRoute(pathSegments, 1, turn1), 1, ());
+ TEST_EQUAL(turn1.m_turn, TurnDirection::UTurnLeft, ());
+ TurnItem turn2;
+ TEST_EQUAL(CheckUTurnOnRoute(pathSegments, 2, turn2), 1, ());
+ TEST_EQUAL(turn2.m_turn, TurnDirection::UTurnLeft, ());
+
+ // Empty path test.
+ TurnItem turn3;
+ TEST_EQUAL(CheckUTurnOnRoute(pathSegments, 3, turn3), 0, ());
+}
} // namespace
diff --git a/routing/turns_generator.cpp b/routing/turns_generator.cpp
index ad5bcda522..3f4693677e 100644
--- a/routing/turns_generator.cpp
+++ b/routing/turns_generator.cpp
@@ -668,12 +668,16 @@ size_t CheckUTurnOnRoute(TUnpackedPathSegments const & segments,
auto const & masterSegment = segments[currentSegment - 1];
if (masterSegment.m_path.size() < 2)
return 0;
+
// Roundabout is not the UTurn.
if (masterSegment.m_onRoundabout)
return 0;
for (size_t i = 0; i < kUTurnLookAhead && i + currentSegment < segments.size(); ++i)
{
auto const & checkedSegment = segments[currentSegment + i];
+ if (checkedSegment.m_path.size() < 2)
+ return 0;
+
if (checkedSegment.m_name == masterSegment.m_name &&
checkedSegment.m_highwayClass == masterSegment.m_highwayClass &&
checkedSegment.m_isLink == masterSegment.m_isLink && !checkedSegment.m_onRoundabout)
diff --git a/routing/turns_generator.hpp b/routing/turns_generator.hpp
index 4ea146039a..c2b1c7226e 100644
--- a/routing/turns_generator.hpp
+++ b/routing/turns_generator.hpp
@@ -130,9 +130,10 @@ TurnDirection GetRoundaboutDirection(bool isIngoingEdgeRoundabout, bool isOutgoi
void GetTurnDirection(IRoutingResult const & result, turns::TurnInfo & turnInfo, TurnItem & turn);
/*!
- * \brief Finds an UTurn that starts from current segment and returns how many segments it lasts.
- * Returns 0 if there is no UTurn.
- * Warning! currentSegment must be greater than 0.
+ * \brief Finds an U-turn that starts from master segment and returns how many segments it lasts.
+ * \returns an index in |segments| that has the opposite direction with master segment
+ * (|segments[currentSegment - 1]|) and 0 if there is no UTurn.
+ * \warning |currentSegment| must be greater than 0.
*/
size_t CheckUTurnOnRoute(TUnpackedPathSegments const & segments,
size_t currentSegment, TurnItem & turn);
diff --git a/search/processor.cpp b/search/processor.cpp
index 2e97557a6b..4c96b0c704 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -127,6 +127,7 @@ void SendStatistics(SearchParams const & params, m2::RectD const & viewport, Res
{"results", resultString},
};
alohalytics::LogEvent("searchEmitResultsAndCoords", stats);
+ GetPlatform().SendMarketingEvent("searchEmitResultsAndCoords", {});
}
} // namespace
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 82358cb482..57210b0411 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -830,6 +830,7 @@ void Storage::OnMapDownloadFinished(TCountryId const & countryId, bool success,
{"status", success ? "ok" : "failed"},
{"version", strings::to_string(GetCurrentDataVersion())},
{"option", DebugPrint(files)}}));
+ GetPlatform().SendMarketingEvent("Downloader_Map_action_finished", {{"action", "download"}});
}
success = success && RegisterDownloadedFiles(countryId, files);
diff --git a/strings.txt b/strings.txt
index 5b93ad8633..ed95cf256e 100644
--- a/strings.txt
+++ b/strings.txt
@@ -13913,18 +13913,64 @@
tags = ios, android
en = Show More
ru = Показать больше
- fr = Voir plus
+ ar = إظهار المزيد
+ cs = Zobrazit více
+ da = Vis mere
+ nl = Meer Tonen
+ fi = Näytä lisää
+ fr = Afficher plus
de = Mehr anzeigen
+ hu = Továbbiak megjelenítése
+ id = Selengkapnya
+ it = Mostra altro
+ ja = 表示を増やす
+ ko = 자세히 표시
+ nb = Vis mer
+ pl = Pokaż więcej
+ pt = Mostrar mais
+ ro = Arată mai multe
+ es = Mostrar más
+ sv = Visa mer
+ th = แสดงเพิ่มเติม
+ tr = Daha fazla göster
+ uk = Показати більше
+ vi = Hiển thị nhiều hơn
+ zh-Hans = 显示更多
zh-Hant = 顯示更多
+ el = Περισσότερα
+ sk = Ukázať viac
[show_less]
comment = small button to close list with names in different languages
tags = ios, android
en = Show Less
ru = Показать меньше
- fr = Voir moins
+ ar = إظهار أقل
+ cs = Zobrazit méně
+ da = Vis mindre
+ nl = Minder Tonen
+ fi = Näytä vähemmän
+ fr = Afficher moins
de = Weniger anzeigen
- zh-Hant = 顯示較少
+ hu = Kevesebb megjelenítése
+ id = Kurangi
+ it = Mostra meno
+ ja = 表示を減らす
+ ko = 간단히 표시
+ nb = Vis mindre
+ pl = Pokaż mniej
+ pt = Mostrar Menos
+ ro = Arată mai puține
+ es = Mostrar menos
+ sv = Visa mindre
+ th = แสดงน้อยลง
+ tr = Daha az göster
+ uk = Показати менше
+ vi = Hiển thị ít hơn
+ zh-Hans = 显示更少
+ zh-Hant = 顯示更少
+ el = Λιγότερα
+ sk = Ukázať menej
[add_language]
tags = ios, android
@@ -19752,3 +19798,124 @@
zh-Hant = 拒絕
el = Διαφωνώ
sk = Odmietnuť
+
+ [whats_new_route_profile_title]
+ en = Better go about than fall into the ditch
+ en-GB = Better to go about than to fall into the ditch
+ ru = Умный в гору не пойдет
+ ar = الأفضل العثور على حل بدلا من السقوط في خندق
+ cs = Nejlepší je vyřešit to jednou pro vždy
+ da = Spring over hvor gærdet er lavest
+ nl = Beter ten halve gekeerd, dan ten hele gedwaald
+ fi = Parempi katsoa kuin katua
+ fr = C'est en se bougeant que l'on trouve des solutions
+ de = Am besten den leichtesten Weg gehen
+ hu = Az árkot jobb megkerülni, mint beleesni
+ id = Jalan-jalan dengan lebih aman dan nyaman
+ it = Meglio è tornar indietro, che correr male avanti
+ ja = 時は金なり。古きを捨て新しきを得よう。
+ ko = 문제가 있으면 계속 어려움을 겪는 것보다 그만두는 게 낫습니다.
+ nb = Range vegen vert ikkje rett om det er mange som går han
+ pl = Kto drogi prostuje, ten w domu nie nocuje
+ pt = Circular é viver
+ ro = Mai bine căutați soluții decât să greșiți
+ es = Más vale rodear que no ahogar
+ sv = Genvägar är senvägar
+ th = ทำให้มันจบดีกว่าปล่อยให้มันรบกวนอยู่
+ tr = Düz yoldan gitmek çukura düşmekten daha iyidir
+ uk = Мудрий в гори б не звернув, мудрий гори б обминув
+ vi = Đi đường vòng vẫn tốt hơn là rơi xuống hố
+ zh-Hans = 与其循规蹈矩,不如奋起改变
+ zh-Hant = 與其長年勞而無功,不如奮起振作
+ el = Καλύτερα να ξέρεις παρά να εμπιστεύεσαι
+ sk = Radšej dlhšia cesta, ale bezpečná
+
+ [whats_new_route_profile_message]
+ en = For pedestrian and bike routes we now display the elevation profile.
+ ru = На пеших и веломаршрутах отображается профиль рельефа.
+ ar = بالنسبة لمسارات المشاة والدراجات نحن الآن نعرض تشكيل الارتفاع.
+ cs = U pěších a cyklistických tras nyní zobrazujeme výškový profil.
+ da = Vi viser nu højdeprofilen for fodgænger- og cykelruter.
+ nl = Voor wandel- en fietsroutes geven we nu het hoogteprofiel weer.
+ fi = Näytämme nyt maaston korkeuden kävely- ja pyöräilyreittejä varten.
+ fr = Pour les routes pédestres et cyclables nous affichons maintenant le profil d'élévation.
+ de = Für Fußgänger- und Fahrradrouten zeigen wir nun das Höhenprofil an.
+ hu = A gyalogos és kerékpáros utakat most már emelkedési profillal jelenítjük meg.
+ id = Untuk rute pejalan kaki dan sepeda, kami kini menampilkan profil elevasi.
+ it = Per gli itinerari pedonali e ciclabili, è ora visualizzato il profilo altimetrico.
+ ja = 歩行者とバイク用のルートに高度プロファイルが表示されるようになりました。
+ ko = 보행자 및 자전거 도로를 위해 이제 고도 단면을 표시합니다.
+ nb = Vi viser nå høydeprofilen med tanke på gå- og sykkelruter.
+ pl = Dla tras pieszych i rowerowych pokazujemy teraz też profil wysokościowy.
+ pt = Nas rotas para peões e ciclovias apresentamos agora o perfil de elevação.
+ ro = Pentru rutele pentru pietoni și bicicliști, afișam acum profilul de elevație.
+ es = Ahora se muestra el perfil de elevación en los itinerarios pedestres y en bicicleta.
+ sv = För gångvägar och cykelturer visar vi nu höjdprofilen.
+ th = สำหรับเส้นทางคนเดินเท้าและจักรยาน ตอนนี้เราแสดงโปรไฟล์ระดับความสูงแล้ว
+ tr = Yürüyüş ve bisiklet yolları şimdi yükseklik profilli olarak görüntüleniyor.
+ uk = Для пішохідних і велосипедних маршрутів тепер відображається профіль рельєфу.
+ vi = Đố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.
+ zh-Hans = 对于行人和自行车路线,我们现在显示纵剖面。
+ zh-Hant = 對於行人和自行車路線,我們現在顯示海拔剖面圖。
+ el = Για διαδρομές πεζών και ποδηλατών, υπάρχει πλέον διαθέσιμο ανυψωμένο προφίλ.
+ sk = Pre pešie trasy a cyklotrasy sa odteraz zobrazuje aj výškový profil.
+
+ [whats_new_booking_improve_title]
+ en = Save when booking hotels
+ ru = Экономь на бронировании отеля
+ ar = توفير عند حجز الفنادق
+ cs = Ušetřete při rezervaci hotelů
+ da = Spar penge når du bestiller hotelværelser
+ nl = Bespaar op het boeken van hotels
+ fi = Säästä hotellivarauksissa
+ fr = Économisez de l'argent en réservant des hôtels
+ de = Beim Buchen von Hotels sparen
+ hu = Takarékoskodjon szálláshely foglalásakor
+ id = Berhemat saat memesan hotel
+ it = Risparmia alla prenotazione degli hotel
+ ja = ホテル予約時に節約しましょう
+ ko = 호텔 예약 시 절약
+ nb = Spar penger når du bestiller hotell
+ pl = Oszczędzaj przy rezerwacji hotelów
+ pt = Poupe nas reservas de hotéis
+ ro = Economisiți bani când rezervați hoteluri
+ es = Ahorrar al reservar hoteles
+ sv = Spara pengar när du bokar hotell
+ th = ประหยัดเมื่อจองโรงแรม
+ tr = Otel rezervasyonlarınızdan tasarruf edin
+ uk = Заощаджуйте на бронюванні готелів
+ vi = Tiết kiệm khi đặt khách sạn
+ zh-Hans = 优惠预订酒店
+ zh-Hant = 優惠預訂飯店
+ el = Εξοικονομήστε χρήματα όταν κάνετε κράτηση σε ξενοδοχεία
+ sk = Ušetriť pri rezervácii hotelov
+
+ [whats_new_booking_improve_message]
+ en = Search results for hotels now contain the price category.\nWe also added more than 110,000 hotels.
+ ru = Результаты поиска отелей на карте показывают ценовую категорию.\nОтелей для бронирования стало на 110 000 больше.
+ ar = تحتوي نتائج البحث عن الفنادق الآن على فئة السعر.\nوأضفنا أيضًا أكثر من 110000 فندق.
+ cs = Výsledky hledání hotelů nyní obsahují cenové kategorie. \nTaké jsme přidali více než 110 000 hotelů.
+ da = Søgeresultater for hoteller viser nu også priskategorien.\nVi har desuden tilføjet mere end 110.000 hoteller.
+ nl = Zoekresultaten voor hotels bevatten nu de prijscategorie.\nWe hebben ook meer dan 110.000 hotels toegevoegd.
+ fi = Hotellien hakutuloksissa näkyy nyt hintakategoria.\nLisäsimme myös yli 110 000 hotellia.
+ fr = 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.
+ de = Suchergebnisse für Hotels enthalten jetzt die Kategorie Preis.\nAußerdem haben wir über 110.000 Hotels hinzugefügt.
+ hu = 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.
+ id = Hasil pencarian untuk hotel kini disertai kategori harga.\nKami juga menambahkan lebih dari 110.000 hotel.
+ it = I risultati della ricerca per gli hotel contengono ora la categoria di prezzo.\nInoltre, abbiamo aggiunto più di 110.000 hotel.
+ ja = ホテルの検索結果に価格のカテゴリーが表示されるようになりました。\nさらに、 110,000 軒を超えるホテルを追加しました。
+ ko = 이제 가격 범주를 포함하는 호텔에 대한 결과를 검색하세요.\n또한 110,000곳 이상의 호텔이 추가되었습니다.
+ nb = Søkeresultatene for hoteller inneholder nå priskategori.\nVi har også lagt til flere enn 110.000 hoteller.
+ pl = Wyniki wyszukiwania hoteli zawierają teraz kategorię cenową. \nDodaliśmy też ponad 110 000 hoteli.
+ pt = Agora, os resultados da pesquisa de hotéis contêm a categoria de preços.\nAdicinámos mais de 110.000 hotéis.
+ ro = Rezultatele de căutare pentru hoteluri conțin acum categoria de preț. \nAm mai adăugat și peste 110.000 de hoteluri.
+ es = La búsqueda de resultados de hoteles ahora contiene la categoría de precios.\nHemos añadido más de 110 000 hoteles.
+ sv = Sökresultat för hotell innehåller nu priskategorin.\nVi har även lagt till över 110 000 hotell.
+ th = การค้นหาโรงแรมตอนนี้มีหมวดหมู่ราคาแล้ว\nเรายังได้เพิ่มโรงแรมเข้ามากว่า 110,000 โรงแรมอีกด้วย
+ tr = Artık otel arama sonuçlarında fiyat kategorisi de gösteriliyor.\nVe 110,000'den fazla oteli sistemimize ekledik.
+ uk = В результатах пошуку готелів на карті відображається цінова категорія.\nКрім того, тепер у нашій базі даних з'явилося 110 000 нових готелів.
+ vi = 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.
+ zh-Hans = 酒店的搜索结果现在包含价格类别。\n我们还添加了超过 110,000 家酒店。
+ zh-Hant = 飯店搜尋結果現在還包含價格類別。\n我們還加入了超過 110,000 間飯店。
+ el = Τα αποτελέσματα αναζήτησης για ξενοδοχεία περιέχουν πλέον κατηγορία τιμής. \nΠροσθέσαμε επίσης περισσότερα από 110.000 ξενοδοχεία.
+ sk = Výsledky vyhľadávania hotelov odteraz obsahujú aj cenové kategórie. \nTiež sme pridali viac ako 110 000 hotelov.