diff --git a/data/drawing_rules.bin b/data/drawing_rules.bin deleted file mode 100644 index 2929692b2d..0000000000 Binary files a/data/drawing_rules.bin and /dev/null differ diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index f74ee2658f..d041fb1638 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 49DE1CA413437D7A00A93417 /* libbzip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49DE1CA213437D7A00A93417 /* libbzip2.a */; }; EE026F0611D6AC0D00645242 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; }; EE026F0D11D6AC2800645242 /* basic_ldpi.skn in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0811D6AC2800645242 /* basic_ldpi.skn */; }; - EE026F0E11D6AC2800645242 /* drawing_rules.bin in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0911D6AC2800645242 /* drawing_rules.bin */; }; EE12020911CD464100ABDD5D /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE1201FF11CD464100ABDD5D /* libbase.a */; }; EE12020A11CD464100ABDD5D /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020011CD464100ABDD5D /* libcoding.a */; }; EE12020C11CD464100ABDD5D /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020211CD464100ABDD5D /* libexpat.a */; }; @@ -630,7 +629,6 @@ 8D1107310486CEB800E47090 /* MapsWithMe-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "MapsWithMe-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; EE026F0511D6AC0D00645242 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = classificator.txt; path = ../../data/classificator.txt; sourceTree = SOURCE_ROOT; }; EE026F0811D6AC2800645242 /* basic_ldpi.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_ldpi.skn; path = ../../data/basic_ldpi.skn; sourceTree = SOURCE_ROOT; }; - EE026F0911D6AC2800645242 /* drawing_rules.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drawing_rules.bin; path = ../../data/drawing_rules.bin; sourceTree = SOURCE_ROOT; }; EE1201FF11CD464100ABDD5D /* libbase.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbase.a; sourceTree = SOURCE_ROOT; }; EE12020011CD464100ABDD5D /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcoding.a; sourceTree = SOURCE_ROOT; }; EE12020211CD464100ABDD5D /* libexpat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libexpat.a; sourceTree = SOURCE_ROOT; }; @@ -1384,7 +1382,6 @@ EEE4C93D1298A2F3007231A9 /* symbols_ldpi.png */, FA500587128907F0002961F0 /* visibility.txt */, EE026F0811D6AC2800645242 /* basic_ldpi.skn */, - EE026F0911D6AC2800645242 /* drawing_rules.bin */, EE026F0511D6AC0D00645242 /* classificator.txt */, ); name = "External Resources"; @@ -2032,7 +2029,6 @@ 28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */, EE026F0611D6AC0D00645242 /* classificator.txt in Resources */, EE026F0D11D6AC2800645242 /* basic_ldpi.skn in Resources */, - EE026F0E11D6AC2800645242 /* drawing_rules.bin in Resources */, FA065FED128614C400FEA989 /* MainWindow-iPad.xib in Resources */, FA065FFF1286167A00FEA989 /* Default@2x.png in Resources */, FA0660001286167A00FEA989 /* Default.png in Resources */, diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index 5b38d7c472..1b13c108b2 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -40,7 +40,7 @@ UNIT_TEST(WritablePathForFile) UNIT_TEST(GetReader) { char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp"; - char const * arr[] = { "drawing_rules.bin", "basic.skn", "classificator.txt", "minsk-pass.mwm" }; + char const * arr[] = { "drules_proto.txt", "basic.skn", "classificator.txt", "minsk-pass.mwm" }; Platform & p = GetPlatform(); for (size_t i = 0; i < ARRAY_SIZE(arr); ++i) { diff --git a/qt/qt.pro b/qt/qt.pro index 6e67cd584b..9699fb62aa 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -42,8 +42,8 @@ macx* { ../data/languages.txt ../data/categories.txt \ ../data/packed_polygons.bin CLASSIFICATOR_RES.path = Contents/Resources - CLASSIFICATOR_RES.files = ../data/classificator.txt ../data/drawing_rules.bin \ - ../data/visibility.txt ../data/types.txt ../data/drules_proto.txt + CLASSIFICATOR_RES.files = ../data/classificator.txt ../data/visibility.txt \ + ../data/types.txt ../data/drules_proto.txt SKIN_RES.path = Contents/Resources SKIN_RES.files = ../data/basic_ldpi.skn ../data/symbols_ldpi.png FONT_RES.path = Contents/Resources diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh index cf3432e37c..27e0c33744 100755 --- a/tools/android/update_assets.sh +++ b/tools/android/update_assets.sh @@ -10,7 +10,7 @@ rm $DST/* files=(01_dejavusans.ttf 02_wqy-microhei.ttf 03_jomolhari-id-a3d.ttf 04_padauk.ttf \ 05_khmeros.ttf 06_code2000.ttf World.mwm WorldCoasts.mwm about-travelguide-iphone.html \ basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn categories.txt classificator.txt types.txt countries.txt \ - drawing_rules.bin fonts_blacklist.txt fonts_whitelist.txt languages.txt \ + fonts_blacklist.txt fonts_whitelist.txt languages.txt \ maps.update symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png unicode_blocks.txt visibility.txt \ drules_proto.txt)