diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index 85488ad820..a8f66799af 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -176,6 +176,16 @@
location = "group:../std/windows.hpp">
+
+
+
+
+
+
@@ -288,6 +298,9 @@
+
+
diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..e2ce4e7885
--- /dev/null
+++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj
@@ -0,0 +1,326 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 67BECB5F1DDA44FD00FC4E99 /* speed_groups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BECB5B1DDA44FD00FC4E99 /* speed_groups.cpp */; };
+ 67BECB601DDA44FD00FC4E99 /* speed_groups.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BECB5C1DDA44FD00FC4E99 /* speed_groups.hpp */; };
+ 67BECB611DDA44FD00FC4E99 /* traffic_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BECB5D1DDA44FD00FC4E99 /* traffic_info.cpp */; };
+ 67BECB621DDA44FD00FC4E99 /* traffic_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */; };
+ 67BECB811DDA46A600FC4E99 /* traffic_info_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */; };
+ 67BECB821DDA474400FC4E99 /* libtraffic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BECB4A1DDA43AF00FC4E99 /* libtraffic.a */; };
+ 67BECB851DDA474400FC4E99 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BECB841DDA474400FC4E99 /* libbase.a */; };
+ 67BECB871DDA475500FC4E99 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BECB861DDA475500FC4E99 /* libplatform.a */; };
+ 67BECB891DDA476A00FC4E99 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BECB881DDA476A00FC4E99 /* libcoding.a */; };
+ 67BECB8C1DDA478E00FC4E99 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67BECB8A1DDA478800FC4E99 /* testingmain.cpp */; };
+ 67BECB8E1DDA47B200FC4E99 /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67BECB8D1DDA47B200FC4E99 /* libtomcrypt.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 67BECB4A1DDA43AF00FC4E99 /* libtraffic.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtraffic.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ 67BECB581DDA43FB00FC4E99 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = ""; };
+ 67BECB591DDA440100FC4E99 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = ""; };
+ 67BECB5B1DDA44FD00FC4E99 /* speed_groups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speed_groups.cpp; sourceTree = ""; };
+ 67BECB5C1DDA44FD00FC4E99 /* speed_groups.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = speed_groups.hpp; sourceTree = ""; };
+ 67BECB5D1DDA44FD00FC4E99 /* traffic_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_info.cpp; sourceTree = ""; };
+ 67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_info.hpp; sourceTree = ""; };
+ 67BECB671DDA466800FC4E99 /* traffic_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = traffic_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ 67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_info_test.cpp; sourceTree = ""; };
+ 67BECB841DDA474400FC4E99 /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbase.a; path = "../../../omim-build/xcode/Debug/libbase.a"; sourceTree = ""; };
+ 67BECB861DDA475500FC4E99 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-build/xcode/Debug/libplatform.a"; sourceTree = ""; };
+ 67BECB881DDA476A00FC4E99 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-build/xcode/Debug/libcoding.a"; sourceTree = ""; };
+ 67BECB8A1DDA478800FC4E99 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; };
+ 67BECB8D1DDA47B200FC4E99 /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtomcrypt.a; path = "../../../omim-build/xcode/Debug/libtomcrypt.a"; sourceTree = ""; };
+ 67BECB941DDA4AC800FC4E99 /* bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bindings.cpp; sourceTree = ""; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 67BECB471DDA43AF00FC4E99 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 67BECB641DDA466800FC4E99 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 67BECB8E1DDA47B200FC4E99 /* libtomcrypt.a in Frameworks */,
+ 67BECB891DDA476A00FC4E99 /* libcoding.a in Frameworks */,
+ 67BECB871DDA475500FC4E99 /* libplatform.a in Frameworks */,
+ 67BECB851DDA474400FC4E99 /* libbase.a in Frameworks */,
+ 67BECB821DDA474400FC4E99 /* libtraffic.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 67BECB411DDA43AF00FC4E99 = {
+ isa = PBXGroup;
+ children = (
+ 67BECB581DDA43FB00FC4E99 /* common-debug.xcconfig */,
+ 67BECB591DDA440100FC4E99 /* common-release.xcconfig */,
+ 67BECB5A1DDA449C00FC4E99 /* traffic */,
+ 67BECB7E1DDA467A00FC4E99 /* traffic_tests */,
+ 67BECB8F1DDA47E400FC4E99 /* pytraffic */,
+ 67BECB4B1DDA43AF00FC4E99 /* Products */,
+ 67BECB831DDA474400FC4E99 /* Frameworks */,
+ );
+ sourceTree = "";
+ };
+ 67BECB4B1DDA43AF00FC4E99 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 67BECB4A1DDA43AF00FC4E99 /* libtraffic.a */,
+ 67BECB671DDA466800FC4E99 /* traffic_tests.app */,
+ );
+ name = Products;
+ sourceTree = "";
+ };
+ 67BECB5A1DDA449C00FC4E99 /* traffic */ = {
+ isa = PBXGroup;
+ children = (
+ 67BECB5B1DDA44FD00FC4E99 /* speed_groups.cpp */,
+ 67BECB5C1DDA44FD00FC4E99 /* speed_groups.hpp */,
+ 67BECB5D1DDA44FD00FC4E99 /* traffic_info.cpp */,
+ 67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */,
+ );
+ name = traffic;
+ path = ../../traffic;
+ sourceTree = "";
+ };
+ 67BECB7E1DDA467A00FC4E99 /* traffic_tests */ = {
+ isa = PBXGroup;
+ children = (
+ 67BECB8A1DDA478800FC4E99 /* testingmain.cpp */,
+ 67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */,
+ );
+ name = traffic_tests;
+ path = ../../traffic/traffic_tests;
+ sourceTree = "";
+ };
+ 67BECB831DDA474400FC4E99 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 67BECB8D1DDA47B200FC4E99 /* libtomcrypt.a */,
+ 67BECB881DDA476A00FC4E99 /* libcoding.a */,
+ 67BECB861DDA475500FC4E99 /* libplatform.a */,
+ 67BECB841DDA474400FC4E99 /* libbase.a */,
+ );
+ name = Frameworks;
+ sourceTree = "";
+ };
+ 67BECB8F1DDA47E400FC4E99 /* pytraffic */ = {
+ isa = PBXGroup;
+ children = (
+ 67BECB941DDA4AC800FC4E99 /* bindings.cpp */,
+ );
+ name = pytraffic;
+ path = ../../traffic/pytraffic;
+ sourceTree = "";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+ 67BECB481DDA43AF00FC4E99 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 67BECB621DDA44FD00FC4E99 /* traffic_info.hpp in Headers */,
+ 67BECB601DDA44FD00FC4E99 /* speed_groups.hpp in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+ 67BECB491DDA43AF00FC4E99 /* traffic */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 67BECB551DDA43B000FC4E99 /* Build configuration list for PBXNativeTarget "traffic" */;
+ buildPhases = (
+ 67BECB461DDA43AF00FC4E99 /* Sources */,
+ 67BECB471DDA43AF00FC4E99 /* Frameworks */,
+ 67BECB481DDA43AF00FC4E99 /* Headers */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = traffic;
+ productName = traffic;
+ productReference = 67BECB4A1DDA43AF00FC4E99 /* libtraffic.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+ 67BECB661DDA466800FC4E99 /* traffic_tests */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 67BECB7B1DDA466800FC4E99 /* Build configuration list for PBXNativeTarget "traffic_tests" */;
+ buildPhases = (
+ 67BECB631DDA466800FC4E99 /* Sources */,
+ 67BECB641DDA466800FC4E99 /* Frameworks */,
+ 67BECB651DDA466800FC4E99 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = traffic_tests;
+ productName = traffic_tests;
+ productReference = 67BECB671DDA466800FC4E99 /* traffic_tests.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 67BECB421DDA43AF00FC4E99 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0810;
+ ORGANIZATIONNAME = Mail.Ru;
+ TargetAttributes = {
+ 67BECB491DDA43AF00FC4E99 = {
+ CreatedOnToolsVersion = 8.1;
+ ProvisioningStyle = Automatic;
+ };
+ 67BECB661DDA466800FC4E99 = {
+ CreatedOnToolsVersion = 8.1;
+ ProvisioningStyle = Automatic;
+ };
+ };
+ };
+ buildConfigurationList = 67BECB451DDA43AF00FC4E99 /* Build configuration list for PBXProject "traffic" */;
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ Base,
+ );
+ mainGroup = 67BECB411DDA43AF00FC4E99;
+ productRefGroup = 67BECB4B1DDA43AF00FC4E99 /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 67BECB491DDA43AF00FC4E99 /* traffic */,
+ 67BECB661DDA466800FC4E99 /* traffic_tests */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 67BECB651DDA466800FC4E99 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 67BECB461DDA43AF00FC4E99 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 67BECB5F1DDA44FD00FC4E99 /* speed_groups.cpp in Sources */,
+ 67BECB611DDA44FD00FC4E99 /* traffic_info.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 67BECB631DDA466800FC4E99 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 67BECB811DDA46A600FC4E99 /* traffic_info_test.cpp in Sources */,
+ 67BECB8C1DDA478E00FC4E99 /* testingmain.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ 67BECB531DDA43B000FC4E99 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 67BECB581DDA43FB00FC4E99 /* common-debug.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ 67BECB541DDA43B000FC4E99 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = 67BECB591DDA440100FC4E99 /* common-release.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ 67BECB561DDA43B000FC4E99 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ EXECUTABLE_PREFIX = lib;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 67BECB571DDA43B000FC4E99 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ EXECUTABLE_PREFIX = lib;
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+ 67BECB7C1DDA466800FC4E99 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+ PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ 67BECB7D1DDA466800FC4E99 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ INFOPLIST_FILE = "$(OMIM_ROOT)/iphone/Maps/MAPSME.plist";
+ PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.traffic-tests";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 67BECB451DDA43AF00FC4E99 /* Build configuration list for PBXProject "traffic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 67BECB531DDA43B000FC4E99 /* Debug */,
+ 67BECB541DDA43B000FC4E99 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 67BECB551DDA43B000FC4E99 /* Build configuration list for PBXNativeTarget "traffic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 67BECB561DDA43B000FC4E99 /* Debug */,
+ 67BECB571DDA43B000FC4E99 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ };
+ 67BECB7B1DDA466800FC4E99 /* Build configuration list for PBXNativeTarget "traffic_tests" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 67BECB7C1DDA466800FC4E99 /* Debug */,
+ 67BECB7D1DDA466800FC4E99 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 67BECB421DDA43AF00FC4E99 /* Project object */;
+}