mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #1403 from Zverik/merged3

Browse source 
[styles] Rename old drules_proto and resources to _legacy, add merged styles
This commit is contained in:
Viktor Govako 2016-01-19 19:00:39 +03:00
commit 381f89b135
78 changed files with 32049 additions and 11714 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/YoPme/assets/resources-mdpi
View file

@ -1 +0,0 @@
../../../data/resources-yota

1
android/YoPme/assets/resources-mdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-mdpi_legacy

1
android/assets/drules_proto.bin
View file

@ -1 +0,0 @@
../../data/drules_proto.bin

1
android/assets/drules_proto_legacy.bin Symbolic link
View file

@ -0,0 +1 @@
../../data/drules_proto_legacy.bin

1
android/assets/resources-6plus
View file

@ -1 +0,0 @@
./../../data/resources-6plus

2
android/assets/resources-6plus_clear
View file

@ -1 +1 @@
./../../data/resources-6plus_clear/
../../data/resources-6plus_clear

2
android/assets/resources-6plus_dark
View file

@ -1 +1 @@
./../../data/resources-6plus_dark/
../../data/resources-6plus_dark

1
android/assets/resources-hdpi
View file

@ -1 +0,0 @@
../../data/resources-hdpi

1
android/assets/resources-hdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../data/resources-hdpi_legacy

1
android/assets/resources-ldpi
View file

@ -1 +0,0 @@
../../data/resources-ldpi

1
android/assets/resources-ldpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../data/resources-ldpi_legacy

1
android/assets/resources-mdpi
View file

@ -1 +0,0 @@
../../data/resources-mdpi

1
android/assets/resources-mdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../data/resources-mdpi_legacy

1
android/assets/resources-xhdpi
View file

@ -1 +0,0 @@
../../data/resources-xhdpi

1
android/assets/resources-xhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../data/resources-xhdpi_legacy

1
android/assets/resources-xxhdpi
View file

@ -1 +0,0 @@
../../data/resources-xxhdpi

1
android/assets/resources-xxhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../data/resources-xxhdpi_legacy

14
android/script/replace_links.bat
View file

@ -6,7 +6,7 @@ cp ../data/categories.txt assets/
cp ../data/classificator.txt assets/
cp ../data/copyright.html assets/
cp ../data/countries.txt assets/
cp ../data/drules_proto.bin assets/
cp ../data/drules_proto_legacy.bin assets/
cp ../data/drules_proto_dark.bin assets/
cp ../data/drules_proto_clear.bin assets/
cp ../data/external_resources.txt assets/
@ -18,22 +18,22 @@ cp ../data/packed_polygons.bin assets/
cp ../data/types.txt assets/
cp ../data/unicode_blocks.txt assets/
cp -r ../data/resources-hdpi/ assets/
cp -r ../data/resources-hdpi_legacy/ assets/
cp -r ../data/resources-hdpi_dark/ assets/
cp -r ../data/resources-hdpi_clear/ assets/
cp -r ../data/resources-ldpi/ assets/
cp -r ../data/resources-ldpi_legacy/ assets/
cp -r ../data/resources-ldpi_dark/ assets/
cp -r ../data/resources-ldpi_clear/ assets/
cp -r ../data/resources-mdpi/ assets/
cp -r ../data/resources-mdpi_legacy/ assets/
cp -r ../data/resources-mdpi_dark/ assets/
cp -r ../data/resources-mdpi_clear/ assets/
cp -r ../data/resources-xhdpi/ assets/
cp -r ../data/resources-xhdpi_legacy/ assets/
cp -r ../data/resources-xhdpi_dark/ assets/
cp -r ../data/resources-xhdpi_clear/ assets/
cp -r ../data/resources-xxhdpi/ assets/
cp -r ../data/resources-xxhdpi_legacy/ assets/
cp -r ../data/resources-xxhdpi_dark/ assets/
cp -r ../data/resources-xxhdpi_clear/ assets/
cp -r ../data/resources-6plus/ assets/
cp -r ../data/resources-6plus_legacy/ assets/
cp -r ../data/resources-6plus_dark/ assets/
cp -r ../data/resources-6plus_clear/ assets/

BIN
data/drules_proto.bin
View file

Binary file not shown.

5018
data/drules_proto.txt
View file

File diff suppressed because it is too large Load diff

BIN
data/drules_proto_legacy.bin Normal file
View file

Binary file not shown.

38196
data/drules_proto-bw.txt → data/drules_proto_legacy.txt
View file

File diff suppressed because it is too large Load diff

0
data/resources-6plus/symbols.png → data/resources-6plus_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 203 KiB

0
data/resources-6plus/symbols.sdf → data/resources-6plus_legacy/symbols.sdf
View file

0
data/resources-hdpi/symbols.png → data/resources-hdpi_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

0
data/resources-hdpi/symbols.sdf → data/resources-hdpi_legacy/symbols.sdf
View file

0
data/resources-ldpi/symbols.png → data/resources-ldpi_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

0
data/resources-ldpi/symbols.sdf → data/resources-ldpi_legacy/symbols.sdf
View file

0
data/resources-mdpi/symbols.png → data/resources-mdpi_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

0
data/resources-mdpi/symbols.sdf → data/resources-mdpi_legacy/symbols.sdf
View file

0
data/resources-xhdpi/symbols.png → data/resources-xhdpi_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 141 KiB

0
data/resources-xhdpi/symbols.sdf → data/resources-xhdpi_legacy/symbols.sdf
View file

0
data/resources-xxhdpi/symbols.png → data/resources-xxhdpi_legacy/symbols.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 231 KiB

0
data/resources-xxhdpi/symbols.sdf → data/resources-xxhdpi_legacy/symbols.sdf
View file

BIN
data/resources-yota/symbols.png → data/resources-yota_legacy/symbols.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

178
data/resources-yota_legacy/symbols.sdf Normal file
View file

@ -0,0 +1,178 @@
<!DOCTYPE skin>
<root>
<file height="256" width="512">
<symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
<symbol minX="71" maxX="131" minY="0" maxY="60" name="compass-image"/>
<symbol minX="131" maxX="162" minY="0" maxY="39" name="current-routing-compas"/>
<symbol minX="162" maxX="193" minY="0" maxY="39" name="current-position-compas"/>
<symbol minX="193" maxX="228" minY="0" maxY="35" name="search-result-active"/>
<symbol minX="228" maxX="245" minY="0" maxY="31" name="placemark-green"/>
<symbol minX="245" maxX="262" minY="0" maxY="31" name="placemark-brown"/>
<symbol minX="262" maxX="279" minY="0" maxY="31" name="placemark-pink"/>
<symbol minX="279" maxX="296" minY="0" maxY="31" name="placemark-purple"/>
<symbol minX="296" maxX="313" minY="0" maxY="31" name="placemark-blue"/>
<symbol minX="313" maxX="330" minY="0" maxY="31" name="placemark-red"/>
<symbol minX="330" maxX="347" minY="0" maxY="31" name="placemark-yellow"/>
<symbol minX="347" maxX="364" minY="0" maxY="31" name="placemark-orange"/>
<symbol minX="364" maxX="387" minY="0" maxY="23" name="baseball"/>
<symbol minX="387" maxX="410" minY="0" maxY="23" name="information"/>
<symbol minX="410" maxX="433" minY="0" maxY="23" name="basketball"/>
<symbol minX="433" maxX="456" minY="0" maxY="23" name="baseball-borderless"/>
<symbol minX="456" maxX="479" minY="0" maxY="23" name="bicycle_rental"/>
<symbol minX="479" maxX="502" minY="0" maxY="23" name="bird"/>
<symbol minX="0" maxX="23" minY="71" maxY="94" name="bowls-borderless"/>
<symbol minX="23" maxX="46" minY="71" maxY="94" name="bowls"/>
<symbol minX="46" maxX="69" minY="71" maxY="94" name="barrier"/>
<symbol minX="69" maxX="92" minY="71" maxY="94" name="bar"/>
<symbol minX="92" maxX="115" minY="71" maxY="94" name="bus-mini"/>
<symbol minX="115" maxX="138" minY="71" maxY="94" name="bus"/>
<symbol minX="138" maxX="161" minY="71" maxY="94" name="bus_sta"/>
<symbol minX="161" maxX="184" minY="71" maxY="94" name="cafe"/>
<symbol minX="184" maxX="207" minY="71" maxY="94" name="campsite"/>
<symbol minX="207" maxX="230" minY="71" maxY="94" name="cannon"/>
<symbol minX="230" maxX="253" minY="71" maxY="94" name="car_rental"/>
<symbol minX="253" maxX="276" minY="71" maxY="94" name="car_repair"/>
<symbol minX="276" maxX="299" minY="71" maxY="94" name="bakery"/>
<symbol minX="299" maxX="322" minY="71" maxY="94" name="castle"/>
<symbol minX="322" maxX="345" minY="71" maxY="94" name="atm"/>
<symbol minX="345" maxX="368" minY="71" maxY="94" name="athletics"/>
<symbol minX="368" maxX="391" minY="71" maxY="94" name="cinema"/>
<symbol minX="391" maxX="414" minY="71" maxY="94" name="clothes"/>
<symbol minX="414" maxX="437" minY="71" maxY="94" name="cricket-borderless"/>
<symbol minX="437" maxX="460" minY="71" maxY="94" name="cricket"/>
<symbol minX="460" maxX="483" minY="71" maxY="94" name="curling-borderless"/>
<symbol minX="483" maxX="506" minY="71" maxY="94" name="curling"/>
<symbol minX="0" maxX="23" minY="94" maxY="117" name="athletics-borderless"/>
<symbol minX="23" maxX="46" minY="94" maxY="117" name="diving-borderless"/>
<symbol minX="46" maxX="69" minY="94" maxY="117" name="diving"/>
<symbol minX="69" maxX="92" minY="94" maxY="117" name="arrow"/>
<symbol minX="92" maxX="115" minY="94" maxY="117" name="dog_park"/>
<symbol minX="115" maxX="138" minY="94" maxY="117" name="archery"/>
<symbol minX="138" maxX="161" minY="94" maxY="117" name="earthquake-camp"/>
<symbol minX="161" maxX="184" minY="94" maxY="117" name="archery-borderless"/>
<symbol minX="184" maxX="207" minY="94" maxY="117" name="equestrian-borderless"/>
<symbol minX="207" maxX="230" minY="94" maxY="117" name="equestrian"/>
<symbol minX="230" maxX="253" minY="94" maxY="117" name="fastfood"/>
<symbol minX="253" maxX="276" minY="94" maxY="117" name="firebrigade"/>
<symbol minX="276" maxX="299" minY="94" maxY="117" name="football-borderless"/>
<symbol minX="299" maxX="322" minY="94" maxY="117" name="football"/>
<symbol minX="322" maxX="345" minY="94" maxY="117" name="fountain"/>
<symbol minX="345" maxX="368" minY="94" maxY="117" name="gate"/>
<symbol minX="368" maxX="391" minY="94" maxY="117" name="golf-course"/>
<symbol minX="391" maxX="414" minY="94" maxY="117" name="gymnastics-borderless"/>
<symbol minX="414" maxX="437" minY="94" maxY="117" name="gymnastics"/>
<symbol minX="437" maxX="460" minY="94" maxY="117" name="hairdresser"/>
<symbol minX="460" maxX="483" minY="94" maxY="117" name="handball-borderless"/>
<symbol minX="483" maxX="506" minY="94" maxY="117" name="handball"/>
<symbol minX="0" maxX="23" minY="117" maxY="140" name="helipad"/>
<symbol minX="23" maxX="46" minY="117" maxY="140" name="hospital"/>
<symbol minX="46" maxX="69" minY="117" maxY="140" name="hostel"/>
<symbol minX="69" maxX="92" minY="117" maxY="140" name="hotel"/>
<symbol minX="92" maxX="115" minY="117" maxY="140" name="alpine_hut"/>
<symbol minX="115" maxX="138" minY="117" maxY="140" name="hunting_closed_high"/>
<symbol minX="138" maxX="161" minY="117" maxY="140" name="information-guidepost"/>
<symbol minX="161" maxX="184" minY="117" maxY="140" name="information-office"/>
<symbol minX="184" maxX="207" minY="117" maxY="140" name="slipway"/>
<symbol minX="207" maxX="230" minY="117" maxY="140" name="shooting"/>
<symbol minX="230" maxX="253" minY="117" maxY="140" name="kindergarten"/>
<symbol minX="253" maxX="276" minY="117" maxY="140" name="kindergarten2"/>
<symbol minX="276" maxX="299" minY="117" maxY="140" name="kiosk"/>
<symbol minX="299" maxX="322" minY="117" maxY="140" name="library"/>
<symbol minX="322" maxX="345" minY="117" maxY="140" name="airport"/>
<symbol minX="345" maxX="368" minY="117" maxY="140" name="man-made-halfpipe"/>
<symbol minX="368" maxX="391" minY="117" maxY="140" name="memorial"/>
<symbol minX="391" maxX="414" minY="117" maxY="140" name="university"/>
<symbol minX="414" maxX="437" minY="117" maxY="140" name="mountain_pass"/>
<symbol minX="437" maxX="460" minY="117" maxY="140" name="museum"/>
<symbol minX="460" maxX="483" minY="117" maxY="140" name="tramway"/>
<symbol minX="483" maxX="506" minY="117" maxY="140" name="tramway-mini"/>
<symbol minX="0" maxX="23" minY="140" maxY="163" name="parking-mini"/>
<symbol minX="23" maxX="46" minY="140" maxY="163" name="toilets"/>
<symbol minX="46" maxX="69" minY="140" maxY="163" name="theatre"/>
<symbol minX="69" maxX="92" minY="140" maxY="163" name="parking"/>
<symbol minX="92" maxX="115" minY="140" maxY="163" name="tennis"/>
<symbol minX="115" maxX="138" minY="140" maxY="163" name="tennis-borderless"/>
<symbol minX="138" maxX="161" minY="140" maxY="163" name="telephone"/>
<symbol minX="161" maxX="184" minY="140" maxY="163" name="parking_roof"/>
<symbol minX="184" maxX="207" minY="140" maxY="163" name="taxi"/>
<symbol minX="207" maxX="230" minY="140" maxY="163" name="synagogue"/>
<symbol minX="230" maxX="253" minY="140" maxY="163" name="peak-mini"/>
<symbol minX="253" maxX="276" minY="140" maxY="163" name="peak"/>
<symbol minX="276" maxX="299" minY="140" maxY="163" name="petrolstation"/>
<symbol minX="299" maxX="322" minY="140" maxY="163" name="pharmacy"/>
<symbol minX="322" maxX="345" minY="140" maxY="163" name="swimming"/>
<symbol minX="345" maxX="368" minY="140" maxY="163" name="playground"/>
<symbol minX="368" maxX="391" minY="140" maxY="163" name="police"/>
<symbol minX="391" maxX="414" minY="140" maxY="163" name="postbox"/>
<symbol minX="414" maxX="437" minY="140" maxY="163" name="postoffice"/>
<symbol minX="437" maxX="460" minY="140" maxY="163" name="swimming-borderless"/>
<symbol minX="460" maxX="483" minY="140" maxY="163" name="supermarket"/>
<symbol minX="483" maxX="506" minY="140" maxY="163" name="subway"/>
<symbol minX="0" maxX="23" minY="163" maxY="186" name="subway-station-s"/>
<symbol minX="23" maxX="46" minY="163" maxY="186" name="subway-station-m"/>
<symbol minX="46" maxX="69" minY="163" maxY="186" name="subway-station-l"/>
<symbol minX="69" maxX="92" minY="163" maxY="186" name="pub"/>
<symbol minX="92" maxX="115" minY="163" maxY="186" name="pubx"/>
<symbol minX="115" maxX="138" minY="163" maxY="186" name="railway-crossing-small"/>
<symbol minX="138" maxX="161" minY="163" maxY="186" name="railway-crossing"/>
<symbol minX="161" maxX="184" minY="163" maxY="186" name="railway-station-mini"/>
<symbol minX="184" maxX="207" minY="163" maxY="186" name="railway-station"/>
<symbol minX="207" maxX="230" minY="163" maxY="186" name="recycling"/>
<symbol minX="230" maxX="253" minY="163" maxY="186" name="religion"/>
<symbol minX="253" maxX="276" minY="163" maxY="186" name="restaurant"/>
<symbol minX="276" maxX="299" minY="163" maxY="186" name="soccer"/>
<symbol minX="299" maxX="322" minY="163" maxY="186" name="soccer-borderless"/>
<symbol minX="322" maxX="345" minY="163" maxY="186" name="ruins"/>
<symbol minX="345" maxX="368" minY="163" maxY="186" name="school"/>
<symbol minX="368" maxX="391" minY="163" maxY="186" name="shelter-fireplace"/>
<symbol minX="391" maxX="414" minY="163" maxY="186" name="shelter"/>
<symbol minX="414" maxX="437" minY="163" maxY="186" name="shooting-borderless"/>
<symbol minX="437" maxX="460" minY="163" maxY="185" name="basketball-borderless"/>
<symbol minX="460" maxX="481" minY="163" maxY="184" name="khanda"/>
<symbol minX="481" maxX="501" minY="163" maxY="183" name="parking-permissive"/>
<symbol minX="0" maxX="20" minY="186" maxY="206" name="parking-private"/>
<symbol minX="20" maxX="38" minY="186" maxY="204" name="speed_trap"/>
<symbol minX="38" maxX="56" minY="186" maxY="204" name="bank"/>
<symbol minX="56" maxX="74" minY="186" maxY="204" name="church"/>
<symbol minX="74" maxX="92" minY="186" maxY="204" name="doctor"/>
<symbol minX="92" maxX="110" minY="186" maxY="204" name="drinking_water"/>
<symbol minX="110" maxX="128" minY="186" maxY="204" name="embassy"/>
<symbol minX="128" maxX="146" minY="186" maxY="204" name="roundabout_left"/>
<symbol minX="146" maxX="164" minY="186" maxY="204" name="housenumber"/>
<symbol minX="164" maxX="182" minY="186" maxY="204" name="windmill"/>
<symbol minX="182" maxX="200" minY="186" maxY="204" name="mosque"/>
<symbol minX="200" maxX="218" minY="186" maxY="204" name="traffic_signal"/>
<symbol minX="218" maxX="236" minY="186" maxY="204" name="parking_roof-permissive"/>
<symbol minX="236" maxX="254" minY="186" maxY="204" name="roundabout_right"/>
<symbol minX="254" maxX="272" minY="186" maxY="204" name="current-position"/>
<symbol minX="272" maxX="289" minY="186" maxY="203" name="viewpoint"/>
<symbol minX="289" maxX="306" minY="186" maxY="203" name="power_photovoltaic"/>
<symbol minX="306" maxX="323" minY="186" maxY="203" name="power_wind"/>
<symbol minX="323" maxX="340" minY="186" maxY="203" name="power_hydro"/>
<symbol minX="340" maxX="357" minY="186" maxY="203" name="lighthouse"/>
<symbol minX="357" maxX="374" minY="186" maxY="203" name="bureau_de_change"/>
<symbol minX="374" maxX="391" minY="186" maxY="203" name="waterfall"/>
<symbol minX="391" maxX="408" minY="186" maxY="203" name="cave_entrance"/>
<symbol minX="408" maxX="425" minY="186" maxY="203" name="power_generic"/>
<symbol minX="425" maxX="442" minY="186" maxY="203" name="wastewater"/>
<symbol minX="442" maxX="459" minY="186" maxY="202" name="car_sharing"/>
<symbol minX="459" maxX="475" minY="186" maxY="202" name="route_from"/>
<symbol minX="475" maxX="490" minY="186" maxY="201" name="api-result"/>
<symbol minX="490" maxX="505" minY="186" maxY="201" name="search-result"/>
<symbol minX="0" maxX="14" minY="206" maxY="220" name="picnic"/>
<symbol minX="14" maxX="28" minY="206" maxY="220" name="bench"/>
<symbol minX="28" maxX="51" minY="206" maxY="219" name="parking_fee"/>
<symbol minX="51" maxX="74" minY="206" maxY="219" name="parking_fee-permissive"/>
<symbol minX="74" maxX="97" minY="206" maxY="219" name="parking_roof_fee-permissive"/>
<symbol minX="97" maxX="120" minY="206" maxY="219" name="park_and_ride"/>
<symbol minX="120" maxX="143" minY="206" maxY="219" name="parking_roof_fee"/>
<symbol minX="143" maxX="166" minY="206" maxY="219" name="park_and_ride-permissive"/>
<symbol minX="166" maxX="177" minY="206" maxY="217" name="vulcan"/>
<symbol minX="177" maxX="188" minY="206" maxY="217" name="disused"/>
<symbol minX="188" maxX="199" minY="206" maxY="217" name="building"/>
<symbol minX="199" maxX="210" minY="206" maxY="217" name="power-tower"/>
<symbol minX="210" maxX="220" minY="206" maxY="216" name="survey_point"/>
<symbol minX="220" maxX="228" minY="206" maxY="214" name="power-pole"/>
<symbol minX="228" maxX="235" minY="206" maxY="213" name="tree"/>
</file>
</root>

14
generator/generator_tool/generator_tool.cpp
View file

@ -18,6 +18,7 @@
#include "indexer/features_offsets_table.hpp"
#include "indexer/features_vector.hpp"
#include "indexer/index_builder.hpp"
#include "indexer/map_style_reader.hpp"
#include "indexer/search_index_builder.hpp"
#include "coding/file_name_utils.hpp"
@ -114,7 +115,7 @@ int main(int argc, char ** argv)
if (!FLAGS_osm_file_type.empty())
genInfo.SetOsmFileType(FLAGS_osm_file_type);
// Generating intermediate files
// Generate intermediate files.
if (FLAGS_preprocess)
{
LOG(LINFO, ("Generating intermediate data ...."));
@ -124,7 +125,10 @@ int main(int argc, char ** argv)
}
}
// load classificator only if necessary
// Use merged style.
GetStyleReader().SetCurrentStyle(MapStyleMerged);
// Load classificator only when necessary.
if (FLAGS_make_coasts || FLAGS_generate_features || FLAGS_generate_geometry ||
FLAGS_generate_index || FLAGS_generate_search_index ||
FLAGS_calc_statistics || FLAGS_type_statistics || FLAGS_dump_types || FLAGS_dump_prefixes ||
@ -134,7 +138,7 @@ int main(int argc, char ** argv)
classif().SortClassificator();
}
// Generate dat file
// Generate dat file.
if (FLAGS_generate_features || FLAGS_make_coasts)
{
LOG(LINFO, ("Generating final data ..."));
@ -176,7 +180,7 @@ int main(int argc, char ** argv)
if (country == WORLD_COASTS_FILE_NAME)
mapType = feature::DataHeader::worldcoasts;
// If error - move to next bucket without index generation.
// On error move to the next bucket without index generation.
LOG(LINFO, ("Generating result features for", country));
if (!feature::GenerateFinalFeatures(genInfo, country, mapType))
@ -204,7 +208,7 @@ int main(int argc, char ** argv)
}
}
// Create http update list for countries and corresponding files
// Create http update list for countries and corresponding files.
if (FLAGS_generate_update)
{
LOG(LINFO, ("Updating countries file..."));

12
indexer/classificator_loader.cpp
View file

@ -51,12 +51,16 @@ namespace classificator
for (size_t i = 0; i < MapStyleCount; ++i)
{
MapStyle const mapStyle = static_cast<MapStyle>(i);
GetStyleReader().SetCurrentStyle(mapStyle);
// Read the merged style only if it was requested.
if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged)
{
GetStyleReader().SetCurrentStyle(mapStyle);
ReadCommon(p.GetReader("classificator.txt"),
p.GetReader("types.txt"));
ReadCommon(p.GetReader("classificator.txt"),
p.GetReader("types.txt"));
drule::LoadRules();
drule::LoadRules();
}
}
GetStyleReader().SetCurrentStyle(originMapStyle);

2
indexer/map_style.cpp
View file

@ -12,6 +12,8 @@ string DebugPrint(MapStyle mapStyle)
return "MapStyleDark";
case MapStyleClear:
return "MapStyleClear";
case MapStyleMerged:
return "MapStyleMerged";
case MapStyleCount:
break;

1
indexer/map_style.hpp
View file

@ -7,6 +7,7 @@ enum MapStyle
MapStyleLight = 0, //< The first must be 0
MapStyleDark = 1,
MapStyleClear = 2,
MapStyleMerged = 3,
// Add new map style here
// Specifies number of MapStyle enum values, must be last

4
indexer/map_style_reader.cpp
View file

@ -11,7 +11,7 @@
namespace
{
const char * const kSuffixLegacyLight = "";
const char * const kSuffixLegacyLight = "_legacy";
const char * const kSuffixLegacyDark = "_dark";
const char * const kSuffixModernClear = "_clear";
@ -25,6 +25,8 @@ string GetStyleSuffix(MapStyle mapStyle)
return kSuffixLegacyDark;
case MapStyleClear:
return kSuffixModernClear;
case MapStyleMerged:
return string();
case MapStyleCount:
break;

88
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -31,7 +31,6 @@
3438CDFC1B862F5C0051AA78 /* MWMSearchContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3438CDFB1B862F5C0051AA78 /* MWMSearchContentView.mm */; };
343F262E1AEFC4A300388A6D /* MWMFrameworkUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 343F262D1AEFC4A300388A6D /* MWMFrameworkUtils.mm */; };
343F26301AEFDB1A00388A6D /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 343F262F1AEFDB1A00388A6D /* Framework.cpp */; };
343F26311AEFDF3E00388A6D /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */; };
344825931B8DBADF00757B1B /* MWMSearchDownloadViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344825911B8DBADF00757B1B /* MWMSearchDownloadViewController.mm */; };
344825941B8DBADF00757B1B /* MWMSearchDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344825921B8DBADF00757B1B /* MWMSearchDownloadViewController.xib */; };
344825971B8DCEC400757B1B /* MWMSearchDownloadView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 344825961B8DCEC400757B1B /* MWMSearchDownloadView.mm */; };
@ -128,7 +127,6 @@
34F45E901B96E8B100AC93F8 /* MWMSearchTabButtonsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34F45E8F1B96E8B100AC93F8 /* MWMSearchTabButtonsView.xib */; };
34F8ADD91B97229A004184CC /* MWMSearchTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34F8ADD81B97229A004184CC /* MWMSearchTableView.mm */; };
34FE4C451BCC013500066718 /* MWMMapWidgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */; };
45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
4519503A1B7A3E070085DA05 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
4519503B1B7A3E390085DA05 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
452FCA3B1B6A3DF7007019AB /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; };
@ -153,7 +151,6 @@
4579C89B1AD2F9A2001D6B90 /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; };
4579C89C1AD2F9A2001D6B90 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
4579C89D1AD2F9E6001D6B90 /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */; };
4579C89E1AD2F9E6001D6B90 /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; };
4579C89F1AD2FA36001D6B90 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; };
4579C8A01AD2FAB1001D6B90 /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; };
4579C8A11AD2FAB1001D6B90 /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; };
@ -211,7 +208,6 @@
6741A9141BF340D1002C974C /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */; };
6741A9151BF340D1002C974C /* resources-xhdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_clear */; };
6741A9161BF340D1002C974C /* resources-xhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */; };
6741A9171BF340D1002C974C /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */; };
6741A9181BF340D1002C974C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA99CB71147089B100689A9A /* Localizable.strings */; };
6741A9191BF340D1002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; };
6741A91A1BF340D1002C974C /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; };
@ -225,7 +221,6 @@
6741A9221BF340D1002C974C /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; };
6741A9231BF340D1002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
6741A9241BF340D1002C974C /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */; };
6741A9251BF340D1002C974C /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; };
6741A9261BF340D1002C974C /* me.maps.watchkitextension.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 347274761B0F4F3900756B37 /* me.maps.watchkitextension.entitlements */; };
6741A9271BF340D1002C974C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; };
6741A9281BF340D1002C974C /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; };
@ -265,11 +260,9 @@
6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE164810135CEE49003B8A3E /* 06_code2000.ttf */; };
6741A95C1BF340DE002C974C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; };
6741A95D1BF340DE002C974C /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; };
6741A95E1BF340DE002C974C /* resources-mdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99D919C1A2CD00C1CF98 /* resources-mdpi */; };
6741A95F1BF340DE002C974C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34C659451BD12A77009DC20A /* InfoPlist.strings */; };
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; };
6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */; };
6741A9621BF340DE002C974C /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */; };
6741A9631BF340DE002C974C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97D40C09184D031900A1D572 /* Images.xcassets */; };
6741A9641BF340DE002C974C /* MWMSearchDownloadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 344825921B8DBADF00757B1B /* MWMSearchDownloadViewController.xib */; };
6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */ = {isa = PBXBuildFile; fileRef = B0DFE62F1A1B78A200B6C35E /* LocalNotifications.plist */; };
@ -277,7 +270,6 @@
6741A9671BF340DE002C974C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 34B6CF5C1BBBFC6B009203C6 /* LaunchScreen.storyboard */; };
6741A9681BF340DE002C974C /* faq.html in Resources */ = {isa = PBXBuildFile; fileRef = 978D4A30199A11E600D72CA7 /* faq.html */; };
6741A9691BF340DE002C974C /* PlacePageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F66A8FB11B0A0954001B9C97 /* PlacePageView.xib */; };
6741A96A1BF340DE002C974C /* resources-xxhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DB19C1A2CD00C1CF98 /* resources-xxhdpi */; };
6741A96B1BF340DE002C974C /* MWMBottomMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349C26B41BB02C6F0005DF2F /* MWMBottomMenuViewController.xib */; };
6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */; };
6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */; };
@ -294,7 +286,6 @@
6741A9781BF340DE002C974C /* AddSetTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D15BA71BD8F93C00C8BCBE /* AddSetTableViewCell.xib */; };
6741A9791BF340DE002C974C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA99CB71147089B100689A9A /* Localizable.strings */; };
6741A97A1BF340DE002C974C /* MWMSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CFFE8C1B7DE71C009D0C9F /* MWMSearchView.xib */; };
6741A97B1BF340DE002C974C /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; };
6741A97C1BF340DE002C974C /* MWMBookmarkColorCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6588E361B15D87A00EE1E58 /* MWMBookmarkColorCell.xib */; };
6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; };
6741A97E1BF340DE002C974C /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */; };
@ -327,7 +318,6 @@
6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; };
6741A99A1BF340DE002C974C /* MWMBookmarkColorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6588E321B15D73100EE1E58 /* MWMBookmarkColorViewController.xib */; };
6741A99B1BF340DE002C974C /* PlacePageInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6CB215B1AEE704D00FB8963 /* PlacePageInfoCell.xib */; };
6741A99C1BF340DE002C974C /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
6741A99D1BF340DE002C974C /* MWMPedestrianShareAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347BAC681B733D540010FF78 /* MWMPedestrianShareAlert.xib */; };
6741A99E1BF340DE002C974C /* MWMNextTurnPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */; };
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; };
@ -606,9 +596,22 @@
97ECD87F1836594400F77A46 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97ECD87E1836594400F77A46 /* StoreKit.framework */; settings = {ATTRIBUTES = (Required, ); }; };
97F0817E19AF72590098FB0B /* BadgeView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F0817D19AF72590098FB0B /* BadgeView.mm */; };
97F61794183E7445009919E2 /* LinkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 97F61793183E7445009919E2 /* LinkCell.mm */; };
97FC99DC19C1A2CD00C1CF98 /* resources-mdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99D919C1A2CD00C1CF98 /* resources-mdpi */; };
97FC99DE19C1A2CD00C1CF98 /* resources-xhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */; };
97FC99E019C1A2CD00C1CF98 /* resources-xxhdpi in Resources */ = {isa = PBXBuildFile; fileRef = 97FC99DB19C1A2CD00C1CF98 /* resources-xxhdpi */; };
9DA46A081C47E92100EF52BA /* resources-hdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */; };
9DA46A091C47E92100EF52BA /* resources-hdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */; };
9DA46A0A1C47E92100EF52BA /* resources-mdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */; };
9DA46A0B1C47E92100EF52BA /* resources-mdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */; };
9DA46A0C1C47E92100EF52BA /* resources-xhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */; };
9DA46A0D1C47E92100EF52BA /* resources-xhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */; };
9DA46A0E1C47E92100EF52BA /* resources-xxhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A071C47E92100EF52BA /* resources-xxhdpi_legacy */; };
9DA46A0F1C47E92100EF52BA /* resources-xxhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A071C47E92100EF52BA /* resources-xxhdpi_legacy */; };
9DA46A121C47E95700EF52BA /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */; };
9DA46A131C47E95700EF52BA /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */; };
9DA46A141C47E95700EF52BA /* resources-6plus_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A111C47E95700EF52BA /* resources-6plus_legacy */; };
9DA46A151C47E95700EF52BA /* resources-6plus_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A111C47E95700EF52BA /* resources-6plus_legacy */; };
9DA46A161C47E95A00EF52BA /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */; };
9DA46A171C47E95B00EF52BA /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */; };
9DA46A181C47E96400EF52BA /* resources-xhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */; };
9DA46A191C47E96500EF52BA /* resources-xhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */; };
9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; };
A32B6D4C1A14980500E54A65 /* iosOGLContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = A32B6D491A14980500E54A65 /* iosOGLContext.mm */; };
A32B6D4D1A14980500E54A65 /* iosOGLContextFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = A32B6D4B1A14980500E54A65 /* iosOGLContextFactory.mm */; };
@ -638,8 +641,6 @@
EED10A4511F78D120095FAD4 /* MapViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = EED10A4411F78D120095FAD4 /* MapViewController.mm */; };
EEFE7C1412F8C9E1006AF8C3 /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
EEFE7C1512F8C9E1006AF8C3 /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
F607C1851C032A8800B53A87 /* resources-hdpi in Resources */ = {isa = PBXBuildFile; fileRef = F607C1821C032A8800B53A87 /* resources-hdpi */; };
F607C1861C032A8800B53A87 /* resources-hdpi in Resources */ = {isa = PBXBuildFile; fileRef = F607C1821C032A8800B53A87 /* resources-hdpi */; };
F607C1871C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; };
F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; };
F607C1891C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; };
@ -752,7 +753,6 @@
F6FE2C151B04A44E009814AA /* MWMPlacePageEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE2C141B04A44E009814AA /* MWMPlacePageEntity.mm */; };
F6FF2E2B1B8C5C020063FD1F /* MWMNextTurnPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */; };
F785EB4016386FC4003A38A8 /* BookmarkCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F785EB3F16386FC4003A38A8 /* BookmarkCell.mm */; };
F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = F7FDD822147F30CC005900FA /* drules_proto.bin */; };
FA054612155C465E001F4E37 /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; };
FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA29FDA9141E77F8004ADF66 /* Preferences.mm */; };
FA36B80D15403A4F004560CC /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; };
@ -1032,7 +1032,6 @@
34FE4C431BCC013500066718 /* MWMMapWidgets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapWidgets.h; sourceTree = "<group>"; };
34FE4C441BCC013500066718 /* MWMMapWidgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapWidgets.mm; sourceTree = "<group>"; };
3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
45159BF81B0CA2D5009BFA85 /* resources-6plus */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus"; path = "../../data/resources-6plus"; sourceTree = "<group>"; };
451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = "<group>"; };
452FCA3A1B6A3DF7007019AB /* colors.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = colors.txt; path = ../../data/colors.txt; sourceTree = "<group>"; };
454040681AD2D8D2007A9B12 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@ -1161,9 +1160,12 @@
97F0817D19AF72590098FB0B /* BadgeView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BadgeView.mm; path = Classes/BadgeView.mm; sourceTree = "<group>"; };
97F6178F183E742E009919E2 /* LinkCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LinkCell.h; path = Settings/LinkCell.h; sourceTree = "<group>"; };
97F61793183E7445009919E2 /* LinkCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = LinkCell.mm; path = Settings/LinkCell.mm; sourceTree = "<group>"; };
97FC99D919C1A2CD00C1CF98 /* resources-mdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi"; path = "../../data/resources-mdpi"; sourceTree = "<group>"; };
97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi"; path = "../../data/resources-xhdpi"; sourceTree = "<group>"; };
97FC99DB19C1A2CD00C1CF98 /* resources-xxhdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi"; path = "../../data/resources-xxhdpi"; sourceTree = "<group>"; };
9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_legacy"; path = "../../data/resources-hdpi_legacy"; sourceTree = "<group>"; };
9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_legacy"; path = "../../data/resources-mdpi_legacy"; sourceTree = "<group>"; };
9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_legacy"; path = "../../data/resources-xhdpi_legacy"; sourceTree = "<group>"; };
9DA46A071C47E92100EF52BA /* resources-xxhdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_legacy"; path = "../../data/resources-xxhdpi_legacy"; sourceTree = "<group>"; };
9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_legacy.bin; path = ../../data/drules_proto_legacy.bin; sourceTree = "<group>"; };
9DA46A111C47E95700EF52BA /* resources-6plus_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_legacy"; path = "../../data/resources-6plus_legacy"; sourceTree = "<group>"; };
9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_droidsans-fallback.ttf"; path = "../../data/02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
A32B6D481A14980500E54A65 /* iosOGLContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iosOGLContext.h; path = Platform/opengl/iosOGLContext.h; sourceTree = "<group>"; };
A32B6D491A14980500E54A65 /* iosOGLContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = iosOGLContext.mm; path = Platform/opengl/iosOGLContext.mm; sourceTree = "<group>"; };
@ -1203,7 +1205,6 @@
F60699001B429CC8002BECBB /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
F60699011B429D08002BECBB /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
F60699021B429D23002BECBB /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
F607C1821C032A8800B53A87 /* resources-hdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi"; path = "../../data/resources-hdpi"; sourceTree = "<group>"; };
F607C1831C032A8800B53A87 /* resources-hdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_clear"; path = "../../data/resources-hdpi_clear"; sourceTree = "<group>"; };
F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = "<group>"; };
F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = "<group>"; };
@ -1370,7 +1371,6 @@
F7DD848414FE77F8005695E1 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
F7DD848514FE7C7F005695E1 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
F7DD848614FE7FE0005695E1 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
F7FDD822147F30CC005900FA /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto.bin; path = ../../data/drules_proto.bin; sourceTree = "<group>"; };
FA054610155C465E001F4E37 /* SelectSetVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectSetVC.h; path = Bookmarks/SelectSetVC.h; sourceTree = SOURCE_ROOT; };
FA054611155C465E001F4E37 /* SelectSetVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectSetVC.mm; path = Bookmarks/SelectSetVC.mm; sourceTree = SOURCE_ROOT; };
FA29FDA8141E77F8004ADF66 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preferences.h; path = Settings/Preferences.h; sourceTree = "<group>"; };
@ -2737,6 +2737,12 @@
FA065FC61286143F00FEA989 /* External Resources */ = {
isa = PBXGroup;
children = (
9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */,
9DA46A111C47E95700EF52BA /* resources-6plus_legacy */,
9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */,
9DA46A051C47E92100EF52BA /* resources-mdpi_legacy */,
9DA46A061C47E92100EF52BA /* resources-xhdpi_legacy */,
9DA46A071C47E92100EF52BA /* resources-xxhdpi_legacy */,
3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */,
3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */,
4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */,
@ -2751,16 +2757,10 @@
4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */,
4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */,
A367C93A1B17334800E2B6E7 /* resources-default */,
45159BF81B0CA2D5009BFA85 /* resources-6plus */,
4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */,
97A5967E19B9CD47007A963F /* copyright.html */,
978D4A30199A11E600D72CA7 /* faq.html */,
FAAEA7D0161BD26600CCD661 /* synonyms.txt */,
F7FDD822147F30CC005900FA /* drules_proto.bin */,
97FC99D919C1A2CD00C1CF98 /* resources-mdpi */,
F607C1821C032A8800B53A87 /* resources-hdpi */,
97FC99DA19C1A2CD00C1CF98 /* resources-xhdpi */,
97FC99DB19C1A2CD00C1CF98 /* resources-xxhdpi */,
FAAFD696139D9BE2000AE70C /* categories.txt */,
FA64D9A813F975AD00350ECF /* types.txt */,
452FCA3A1B6A3DF7007019AB /* colors.txt */,
@ -3090,6 +3090,8 @@
EEA61601134C496A003A9827 /* 01_dejavusans.ttf in Resources */,
341C2A571B72092A00AD41A1 /* 02_droidsans-fallback.ttf in Resources */,
4A7D89C81B2EBF3B00AC843E /* resources-xxhdpi_dark in Resources */,
9DA46A0C1C47E92100EF52BA /* resources-xhdpi_legacy in Resources */,
9DA46A0E1C47E92100EF52BA /* resources-xxhdpi_legacy in Resources */,
34BC722B1B0DECAE0012A34B /* MWMZoomButtonsView.xib in Resources */,
EEA61603134C496A003A9827 /* 03_jomolhari-id-a3d.ttf in Resources */,
EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */,
@ -3100,25 +3102,24 @@
EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */,
FAAFD697139D9BE2000AE70C /* categories.txt in Resources */,
FA64D9A913F975AD00350ECF /* types.txt in Resources */,
97FC99DC19C1A2CD00C1CF98 /* resources-mdpi in Resources */,
34C659471BD12A77009DC20A /* InfoPlist.strings in Resources */,
F63774E71B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib in Resources */,
4A7D89C71B2EBF3B00AC843E /* resources-xhdpi_dark in Resources */,
97FC99DE19C1A2CD00C1CF98 /* resources-xhdpi in Resources */,
97D40C0A184D031900A1D572 /* Images.xcassets in Resources */,
344825941B8DBADF00757B1B /* MWMSearchDownloadViewController.xib in Resources */,
9DA46A141C47E95700EF52BA /* resources-6plus_legacy in Resources */,
B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */,
34B82ABB1B837FFD00180497 /* MWMSearchHistoryRequestCell.xib in Resources */,
34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */,
3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
978D4A31199A11E600D72CA7 /* faq.html in Resources */,
F66A8FB21B0A0954001B9C97 /* PlacePageView.xib in Resources */,
97FC99E019C1A2CD00C1CF98 /* resources-xxhdpi in Resources */,
349C26B61BB02C6F0005DF2F /* MWMBottomMenuViewController.xib in Resources */,
F64F19A41AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib in Resources */,
F6BBF2C81B4FFB8C000CF8E2 /* MWMLocationAlert.xib in Resources */,
F6BB6CBE1BB15A5E00DF1DF2 /* MWMRoutePreview.xib in Resources */,
34B82AD71B84746E00180497 /* MWMSearchSuggestionCell.xib in Resources */,
9DA46A0A1C47E92100EF52BA /* resources-mdpi_legacy in Resources */,
F6172FA51BBD5A3E0081D325 /* MWMiPadRoutePreview.xib in Resources */,
97A5967F19B9CD47007A963F /* copyright.html in Resources */,
34B82ADF1B84A4A000180497 /* MWMSearchCommonCell.xib in Resources */,
@ -3129,10 +3130,9 @@
F6ED13561B16439E0095C6DE /* MWMDirectionView.xib in Resources */,
34D15BA91BD8F93C00C8BCBE /* AddSetTableViewCell.xib in Resources */,
FA99CB73147089B100689A9A /* Localizable.strings in Resources */,
9DA46A081C47E92100EF52BA /* resources-hdpi_legacy in Resources */,
34CFFE8D1B7DE71C009D0C9F /* MWMSearchView.xib in Resources */,
F7FDD823147F30CC005900FA /* drules_proto.bin in Resources */,
F6588E381B15D87A00EE1E58 /* MWMBookmarkColorCell.xib in Resources */,
F607C1851C032A8800B53A87 /* resources-hdpi in Resources */,
FAAEA7D1161BD26600CCD661 /* synonyms.txt in Resources */,
4A00DBDF1AB704C400113624 /* drules_proto_dark.bin in Resources */,
4A23D15D1B8B4DD700D4EB6F /* resources-mdpi_clear in Resources */,
@ -3143,6 +3143,7 @@
3438CDF91B8616760051AA78 /* MWMSearchShowOnMapCell.xib in Resources */,
34BAB6EE1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
349A358D1B53EABC009677EE /* MWMSearchDownloadMapRequest.xib in Resources */,
9DA46A121C47E95700EF52BA /* drules_proto_legacy.bin in Resources */,
4A23D15B1B8B4DD700D4EB6F /* drules_proto_clear.bin in Resources */,
341C2A5B1B720B8A00AD41A1 /* MWMAPIBarView.xib in Resources */,
34B82AC51B84608600180497 /* MWMSearchHistoryClearCell.xib in Resources */,
@ -3165,7 +3166,6 @@
F64F199A1AB81A00006EAF7E /* MWMAlertViewController.xib in Resources */,
F6588E331B15D73100EE1E58 /* MWMBookmarkColorViewController.xib in Resources */,
F6CB215C1AEE704D00FB8963 /* PlacePageInfoCell.xib in Resources */,
45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */,
347BAC691B733D540010FF78 /* MWMPedestrianShareAlert.xib in Resources */,
F6FF2E2B1B8C5C020063FD1F /* MWMNextTurnPanel.xib in Resources */,
FAF30A95173AB23900818BF6 /* 07_roboto_medium.ttf in Resources */,
@ -3189,8 +3189,8 @@
6741A9141BF340D1002C974C /* drules_proto_clear.bin in Resources */,
6741A9151BF340D1002C974C /* resources-xhdpi_clear in Resources */,
6741A9161BF340D1002C974C /* resources-xhdpi_dark in Resources */,
6741A9171BF340D1002C974C /* resources-xhdpi in Resources */,
6741A9181BF340D1002C974C /* Localizable.strings in Resources */,
9DA46A191C47E96500EF52BA /* resources-xhdpi_legacy in Resources */,
6741A9191BF340D1002C974C /* 07_roboto_medium.ttf in Resources */,
6741A91A1BF340D1002C974C /* 01_dejavusans.ttf in Resources */,
6741A91B1BF340D1002C974C /* 02_droidsans-fallback.ttf in Resources */,
@ -3203,9 +3203,9 @@
6741A9221BF340D1002C974C /* packed_polygons.bin in Resources */,
6741A9231BF340D1002C974C /* sound-strings in Resources */,
6741A9241BF340D1002C974C /* drules_proto_dark.bin in Resources */,
6741A9251BF340D1002C974C /* drules_proto.bin in Resources */,
6741A9261BF340D1002C974C /* me.maps.watchkitextension.entitlements in Resources */,
6741A9271BF340D1002C974C /* categories.txt in Resources */,
9DA46A171C47E95B00EF52BA /* drules_proto_legacy.bin in Resources */,
6741A9281BF340D1002C974C /* types.txt in Resources */,
6741A9291BF340D1002C974C /* fonts_blacklist.txt in Resources */,
6741A92A1BF340D1002C974C /* fonts_whitelist.txt in Resources */,
@ -3245,6 +3245,8 @@
6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */,
6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */,
6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
9DA46A0D1C47E92100EF52BA /* resources-xhdpi_legacy in Resources */,
9DA46A0F1C47E92100EF52BA /* resources-xxhdpi_legacy in Resources */,
6741A9561BF340DE002C974C /* MWMZoomButtonsView.xib in Resources */,
6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */,
6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */,
@ -3255,25 +3257,24 @@
6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
6741A95C1BF340DE002C974C /* categories.txt in Resources */,
6741A95D1BF340DE002C974C /* types.txt in Resources */,
6741A95E1BF340DE002C974C /* resources-mdpi in Resources */,
6741A95F1BF340DE002C974C /* InfoPlist.strings in Resources */,
6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */,
6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */,
6741A9621BF340DE002C974C /* resources-xhdpi in Resources */,
6741A9631BF340DE002C974C /* Images.xcassets in Resources */,
6741A9641BF340DE002C974C /* MWMSearchDownloadViewController.xib in Resources */,
9DA46A151C47E95700EF52BA /* resources-6plus_legacy in Resources */,
6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */,
6741A9661BF340DE002C974C /* MWMSearchHistoryRequestCell.xib in Resources */,
6741A9671BF340DE002C974C /* LaunchScreen.storyboard in Resources */,
3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
6741A9681BF340DE002C974C /* faq.html in Resources */,
6741A9691BF340DE002C974C /* PlacePageView.xib in Resources */,
6741A96A1BF340DE002C974C /* resources-xxhdpi in Resources */,
6741A96B1BF340DE002C974C /* MWMBottomMenuViewController.xib in Resources */,
6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */,
6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */,
6741A96E1BF340DE002C974C /* MWMRoutePreview.xib in Resources */,
6741A96F1BF340DE002C974C /* MWMSearchSuggestionCell.xib in Resources */,
9DA46A0B1C47E92100EF52BA /* resources-mdpi_legacy in Resources */,
6741A9701BF340DE002C974C /* MWMiPadRoutePreview.xib in Resources */,
6741A9711BF340DE002C974C /* copyright.html in Resources */,
6741A9721BF340DE002C974C /* MWMSearchCommonCell.xib in Resources */,
@ -3284,10 +3285,9 @@
6741A9771BF340DE002C974C /* MWMDirectionView.xib in Resources */,
6741A9781BF340DE002C974C /* AddSetTableViewCell.xib in Resources */,
6741A9791BF340DE002C974C /* Localizable.strings in Resources */,
9DA46A091C47E92100EF52BA /* resources-hdpi_legacy in Resources */,
6741A97A1BF340DE002C974C /* MWMSearchView.xib in Resources */,
6741A97B1BF340DE002C974C /* drules_proto.bin in Resources */,
6741A97C1BF340DE002C974C /* MWMBookmarkColorCell.xib in Resources */,
F607C1861C032A8800B53A87 /* resources-hdpi in Resources */,
6741A97D1BF340DE002C974C /* synonyms.txt in Resources */,
6741A97E1BF340DE002C974C /* drules_proto_dark.bin in Resources */,
6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */,
@ -3298,6 +3298,7 @@
6741A9841BF340DE002C974C /* MWMSearchShowOnMapCell.xib in Resources */,
6741A9851BF340DE002C974C /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
6741A9861BF340DE002C974C /* MWMSearchDownloadMapRequest.xib in Resources */,
9DA46A131C47E95700EF52BA /* drules_proto_legacy.bin in Resources */,
6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */,
6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */,
6741A9891BF340DE002C974C /* MWMSearchHistoryClearCell.xib in Resources */,
@ -3320,7 +3321,6 @@
6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */,
6741A99A1BF340DE002C974C /* MWMBookmarkColorViewController.xib in Resources */,
6741A99B1BF340DE002C974C /* PlacePageInfoCell.xib in Resources */,
6741A99C1BF340DE002C974C /* resources-6plus in Resources */,
6741A99D1BF340DE002C974C /* MWMPedestrianShareAlert.xib in Resources */,
6741A99E1BF340DE002C974C /* MWMNextTurnPanel.xib in Resources */,
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
@ -3336,7 +3336,6 @@
F6C7B7141BA8443C004233F4 /* drules_proto_clear.bin in Resources */,
F6C7B7121BA840A4004233F4 /* resources-xhdpi_clear in Resources */,
F6C7B7131BA840A4004233F4 /* resources-xhdpi_dark in Resources */,
343F26311AEFDF3E00388A6D /* resources-xhdpi in Resources */,
6C47C8BF1AD6C47E000C52C1 /* Localizable.strings in Resources */,
4579C8A11AD2FAB1001D6B90 /* 01_dejavusans.ttf in Resources */,
9DF04B241B71010E00DACAF1 /* 02_droidsans-fallback.ttf in Resources */,
@ -3347,10 +3346,10 @@
4579C8A01AD2FAB1001D6B90 /* 07_roboto_medium.ttf in Resources */,
347274791B0F4FD900756B37 /* me.maps.watchkitextension.production.entitlements in Resources */,
34C659481BD12A77009DC20A /* InfoPlist.strings in Resources */,
9DA46A181C47E96400EF52BA /* resources-xhdpi_legacy in Resources */,
4579C89F1AD2FA36001D6B90 /* packed_polygons.bin in Resources */,
34C6594C1BD12A89009DC20A /* sound-strings in Resources */,
4579C89D1AD2F9E6001D6B90 /* drules_proto_dark.bin in Resources */,
4579C89E1AD2F9E6001D6B90 /* drules_proto.bin in Resources */,
347274771B0F4F3900756B37 /* me.maps.watchkitextension.entitlements in Resources */,
4579C8961AD2F9A1001D6B90 /* categories.txt in Resources */,
4579C8971AD2F9A1001D6B90 /* types.txt in Resources */,
@ -3359,6 +3358,7 @@
4579C89A1AD2F9A2001D6B90 /* unicode_blocks.txt in Resources */,
3472747B1B0F4FF100756B37 /* me.maps.production.entitlements in Resources */,
4579C89B1AD2F9A2001D6B90 /* countries.txt in Resources */,
9DA46A161C47E95A00EF52BA /* drules_proto_legacy.bin in Resources */,
4579C89C1AD2F9A2001D6B90 /* classificator.txt in Resources */,
4579C8951AD2F98B001D6B90 /* synonyms.txt in Resources */,
F6D4344E1AD2AB96007C7728 /* Images.xcassets in Resources */,

9
map/style_tests/classificator_tests.cpp
View file

@ -42,9 +42,12 @@ namespace
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
GetStyleReader().SetCurrentStyle(mapStyle);
LOG(LINFO, ("Test with map style", mapStyle));
fn();
if (mapStyle != MapStyle::MapStyleMerged)
{
GetStyleReader().SetCurrentStyle(mapStyle);
LOG(LINFO, ("Test with map style", mapStyle));
fn();
}
}
}
} // namespace

2
map/style_tests/dashes_test.cpp
View file

@ -19,6 +19,8 @@ UNIT_TEST(Test_Dashes)
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
if (mapStyle == MapStyleMerged)
continue;
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();

2
map/style_tests/style_symbols_consistency_test.cpp
View file

@ -73,6 +73,8 @@ UNIT_TEST(Test_SymbolsConsistency)
for (size_t s = 0; s < MapStyleCount; ++s)
{
MapStyle const mapStyle = static_cast<MapStyle>(s);
if (mapStyle == MapStyleMerged)
continue;
GetStyleReader().SetCurrentStyle(mapStyle);
classificator::Load();

26
platform/platform_tests/apk_test.cpp
View file

@ -15,18 +15,18 @@ namespace
{
char const * arrFiles[] = {
"copyright.html",
"resources-ldpi/basic.skn",
"resources-ldpi/plus.png",
"resources-ldpi/symbols.png",
"resources-mdpi/basic.skn",
"resources-mdpi/plus.png",
"resources-mdpi/symbols.png",
"resources-hdpi/basic.skn",
"resources-hdpi/plus.png",
"resources-hdpi/symbols.png",
"resources-xhdpi/basic.skn",
"resources-xhdpi/plus.png",
"resources-xhdpi/symbols.png",
"resources-ldpi_legacy/basic.skn",
"resources-ldpi_legacy/plus.png",
"resources-ldpi_legacy/symbols.png",
"resources-mdpi_legacy/basic.skn",
"resources-mdpi_legacy/plus.png",
"resources-mdpi_legacy/symbols.png",
"resources-hdpi_legacy/basic.skn",
"resources-hdpi_legacy/plus.png",
"resources-hdpi_legacy/symbols.png",
"resources-xhdpi_legacy/basic.skn",
"resources-xhdpi_legacy/plus.png",
"resources-xhdpi_legacy/symbols.png",
"categories.txt",
"classificator.txt",
"types.txt",
@ -34,7 +34,7 @@ namespace
"fonts_whitelist.txt",
"languages.txt",
"unicode_blocks.txt",
"drules_proto.bin",
"drules_proto_legacy.bin",
"external_resources.txt",
"packed_polygons.bin",
"countries.txt"

2
platform/platform_tests/platform_test.cpp
View file

@ -63,7 +63,7 @@ UNIT_TEST(GetReader)
{
char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
char const * arr[] = {
"resources-ldpi/symbols.sdf",
"resources-ldpi_legacy/symbols.sdf",
"classificator.txt",
"minsk-pass.mwm"
};

10
qt/qt.pro
View file

@ -63,13 +63,13 @@ OTHER_RES.files = ../data/copyright.html ../data/eula.html ../data/welcome.html
CLASSIFICATOR_RES.path = $$DATADIR
CLASSIFICATOR_RES.files = ../data/classificator.txt \
../data/types.txt \
../data/drules_proto.bin
../data/drules_proto_legacy.bin
DEFAULT_SKIN_RES.path = $$DATADIR/resources-default
DEFAULT_SKIN_RES.files = ../resources-default/default.ui
MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi
MDPI_SKIN_RES.files = ../data/resources-mdpi/symbols.sdf ../data/resources-mdpi/symbols.png
XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi
XHDPI_SKIN_RES.files = ../data/resources-xhdpi/symbols.sdf ../data/resources-xhdpi/symbols.png
MDPI_SKIN_RES.path = $$DATADIR/resources-mdpi_legacy
MDPI_SKIN_RES.files = ../data/resources-mdpi_legacy/symbols.sdf ../data/resources-mdpi_legacy/symbols.png
XHDPI_SKIN_RES.path = $$DATADIR/resources-xhdpi_legacy
XHDPI_SKIN_RES.files = ../data/resources-xhdpi_legacy/symbols.sdf ../data/resources-xhdpi_legacy/symbols.png
FONT_RES.path = $$FONTSDIR
FONT_RES.files = ../data/01_dejavusans.ttf \

1
tizen/MapsWithMe/data/drules_proto.bin
View file

@ -1 +0,0 @@
../../../data/drules_proto.bin

1
tizen/MapsWithMe/data/drules_proto_legacy.bin Symbolic link
View file

@ -0,0 +1 @@
../../../data/drules_proto_legacy.bin

1
tizen/MapsWithMe/data/resources-hdpi
View file

@ -1 +0,0 @@
../../../data/resources-hdpi

1
tizen/MapsWithMe/data/resources-hdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-hdpi_legacy

1
tizen/MapsWithMe/data/resources-ldpi
View file

@ -1 +0,0 @@
../../../data/resources-ldpi

1
tizen/MapsWithMe/data/resources-ldpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-ldpi_legacy

1
tizen/MapsWithMe/data/resources-mdpi
View file

@ -1 +0,0 @@
../../../data/resources-mdpi

1
tizen/MapsWithMe/data/resources-mdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-mdpi_legacy

1
tizen/MapsWithMe/data/resources-xhdpi
View file

@ -1 +0,0 @@
../../../data/resources-xhdpi

1
tizen/MapsWithMe/data/resources-xhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-xhdpi_legacy

1
tizen/MapsWithMe/data/resources-xxhdpi
View file

@ -1 +0,0 @@
../../../data/resources-xxhdpi

1
tizen/MapsWithMe/data/resources-xxhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-xxhdpi_legacy

1
tizen/RunUnitTests/res/resources-hdpi
View file

@ -1 +0,0 @@
../../../data/resources-hdpi

1
tizen/RunUnitTests/res/resources-hdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-hdpi_legacy

1
tizen/RunUnitTests/res/resources-ldpi
View file

@ -1 +0,0 @@
../../../data/resources-ldpi

1
tizen/RunUnitTests/res/resources-ldpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-ldpi_legacy

1
tizen/RunUnitTests/res/resources-mdpi
View file

@ -1 +0,0 @@
../../../data/resources-mdpi

1
tizen/RunUnitTests/res/resources-mdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-mdpi_legacy

1
tizen/RunUnitTests/res/resources-xhdpi
View file

@ -1 +0,0 @@
../../../data/resources-xhdpi

1
tizen/RunUnitTests/res/resources-xhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-xhdpi_legacy

1
tizen/RunUnitTests/res/resources-xxhdpi
View file

@ -1 +0,0 @@
../../../data/resources-xxhdpi

1
tizen/RunUnitTests/res/resources-xxhdpi_legacy Symbolic link
View file

@ -0,0 +1 @@
../../../data/resources-xxhdpi_legacy

4
tizen/scripts/update_assets_for_unit_tests.sh
View file

@ -8,9 +8,9 @@ DST=$1
#rm -rf $DST
#mkdir $DST
files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
files=(copyright.html resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \
drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
drules_proto_legacy.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf
minsk-pass.mwm)

4
tizen/scripts/update_assets_for_version.sh
View file

@ -8,9 +8,9 @@ DST=$1
rm -rf $DST
mkdir $DST
files=(copyright.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
files=(copyright.html resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \
drules_proto.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
drules_proto_legacy.bin packed_polygons.bin countries.txt World.mwm WorldCoasts.mwm 00_roboto_regular.ttf 01_dejavusans.ttf 02_droidsans-fallback.ttf
03_jomolhari-id-a3d.ttf 04_padauk.ttf 05_khmeros.ttf 06_code2000.ttf)
for item in ${files[*]}

6
tools/android/update_assets_for_version.sh
View file

@ -8,12 +8,12 @@ DST=$2
rm -rf $DST || true
mkdir $DST || true
files=(copyright.html faq.html resources-default resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
files=(copyright.html faq.html resources-default resources-ldpi_legacy resources-mdpi_legacy resources-hdpi_legacy resources-xhdpi_legacy resources-xxhdpi_legacy categories.txt classificator.txt
resources-ldpi_dark resources-mdpi_dark resources-hdpi_dark resources-xhdpi_dark resources-xxhdpi_dark
resources-ldpi_clear resources-mdpi_clear resources-hdpi_clear resources-xhdpi_clear resources-xxhdpi_clear
resources-6plus resources-6plus_clear resources-6plus_dark
resources-6plus_legacy resources-6plus_clear resources-6plus_dark
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt
drules_proto.bin drules_proto_dark.bin drules_proto_clear.bin external_resources.txt packed_polygons.bin countries.txt sound-strings colors.txt patterns.txt)
drules_proto_legacy.bin drules_proto_dark.bin drules_proto_clear.bin external_resources.txt packed_polygons.bin countries.txt sound-strings colors.txt patterns.txt)
for item in ${files[*]}
do

36
tools/android/update_assets_yota.sh
View file

@ -12,17 +12,17 @@ DST=../../android/YoPme/assets
./add_assets_mwm-ttf.sh $DST
rm -rf $DST/drules_proto.bin
rm -rf $DST/drules_proto_legacy.bin
rm -rf $DST/drules_proto_dark.bin
rm -rf $DST/drules_proto_clear.bin
ln -s $SRC/drules_proto-bw.bin $DST/drules_proto.bin
ln -s $SRC/drules_proto-bw.bin $DST/drules_proto_legacy.bin
rm -rf $DST/resources-ldpi
rm -rf $DST/resources-mdpi
rm -rf $DST/resources-hdpi
rm -rf $DST/resources-xhdpi
rm -rf $DST/resources-xxhdpi
rm -rf $DST/resources-6plus
rm -rf $DST/resources-ldpi_legacy
rm -rf $DST/resources-mdpi_legacy
rm -rf $DST/resources-hdpi_legacy
rm -rf $DST/resources-xhdpi_legacy
rm -rf $DST/resources-xxhdpi_legacy
rm -rf $DST/resources-6plus_legacy
rm -rf $DST/resources-ldpi_dark
rm -rf $DST/resources-mdpi_dark
rm -rf $DST/resources-hdpi_dark
@ -39,7 +39,7 @@ rm -rf $DST/resources-default
rm -rf $DST/sound-strings
rm -rf $DST/colors.txt
rm -rf $DST/patterns.txt
ln -s $SRC/resources-yota $DST/resources-mdpi
ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy
# Yota 2nd generation
@ -49,17 +49,17 @@ DST=../../android/YoPme2/assets
./add_assets_mwm-ttf.sh $DST
rm -rf $DST/drules_proto.bin
rm -rf $DST/drules_proto_legacy.bin
rm -rf $DST/drules_proto_dark.bin
rm -rf $DST/drules_proto_clear.bin
ln -s $SRC/drules_proto-bw.bin $DST/drules_proto.bin
ln -s $SRC/drules_proto-bw.bin $DST/drules_proto_legacy.bin
rm -rf $DST/resources-ldpi
rm -rf $DST/resources-mdpi
rm -rf $DST/resources-hdpi
rm -rf $DST/resources-xhdpi
rm -rf $DST/resources-xxhdpi
rm -rf $DST/resources-6plus
rm -rf $DST/resources-ldpi_legacy
rm -rf $DST/resources-mdpi_legacy
rm -rf $DST/resources-hdpi_legacy
rm -rf $DST/resources-xhdpi_legacy
rm -rf $DST/resources-xxhdpi_legacy
rm -rf $DST/resources-6plus_legacy
rm -rf $DST/resources-ldpi_dark
rm -rf $DST/resources-mdpi_dark
rm -rf $DST/resources-hdpi_dark
@ -76,4 +76,4 @@ rm -rf $DST/resources-default
rm -rf $DST/sound-strings
rm -rf $DST/colors.txt
rm -rf $DST/patterns.txt
ln -s $SRC/resources-yota $DST/resources-mdpi
ln -s $SRC/resources-yota_legacy $DST/resources-mdpi_legacy

2
tools/kothic

@ -1 +1 @@
Subproject commit f0d1becefb28fb48ac1f1679b7ad8272cf936450
Subproject commit e00d57aa052e1b395138e096e1b808cba3164f0c

16
tools/unix/generate_drules.sh
View file

@ -1,11 +1,11 @@
#!/bin/bash
set -e -u -x
set -e -u
# Prevent python from generating compiled *.pyc files
export PYTHONDONTWRITEBYTECODE=1
OMIM_PATH="${OMIM_PATH:-$(dirname "$0")/../..}"
DATA_PATH="$OMIM_PATH/data"
DATA_PATH="${DATA_PATH:-$OMIM_PATH/data}"
function BuildDrawingRules() {
styleType=$1
@ -13,10 +13,9 @@ function BuildDrawingRules() {
suffix=${3-}
echo "Building drawing rules for style $styleName"
# Cleanup
rm $DATA_PATH/drules_proto$suffix.bin || true
rm $DATA_PATH/drules_proto$suffix.txt || true
rm "$DATA_PATH"/drules_proto$suffix.{bin,txt} || true
# Run script to build style
python "$OMIM_PATH/tools/kothic/src/libkomwm.py" \
python "$OMIM_PATH/tools/kothic/src/libkomwm.py" --txt \
-s "$DATA_PATH/styles/$styleType/style-$styleName/style.mapcss" \
-o "$DATA_PATH/drules_proto$suffix"
}
@ -31,4 +30,9 @@ done
# Building drawing rules
BuildDrawingRules clear clear _clear
BuildDrawingRules clear night _dark
BuildDrawingRules legacy light
BuildDrawingRules legacy light _legacy
echo "Merging legacy and new styles"
python "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
"$DATA_PATH/drules_proto_legacy.bin" "$DATA_PATH/drules_proto_clear.bin" \
"$DATA_PATH/drules_proto.bin" "$DATA_PATH/drules_proto.txt" > /dev/null

16
tools/unix/generate_symbols.sh
View file

@ -65,7 +65,7 @@ function BuildSkin() {
}
# Cleanup
cleanup=(resources-{yota,{6plus,ldpi,mdpi,hdpi,xhdpi,xxhdpi}{,_dark,_clear}})
cleanup=(resources-{yota_legacy,{6plus,ldpi,mdpi,hdpi,xhdpi,xxhdpi}{_legacy,_dark,_clear}})
for item in ${cleanup[*]}
do
rm -rf ../../data/$item || true
@ -74,14 +74,14 @@ done
# Build styles
BuildSkin legacy yota yota 19 true
BuildSkin legacy yota yota 19 true _legacy
BuildSkin legacy light ldpi 18 false
BuildSkin legacy light mdpi 18 false
BuildSkin legacy light hdpi 27 false
BuildSkin legacy light xhdpi 36 false
BuildSkin legacy light xxhdpi 54 false
BuildSkin legacy light 6plus 54 false
BuildSkin legacy light ldpi 18 false _legacy
BuildSkin legacy light mdpi 18 false _legacy
BuildSkin legacy light hdpi 27 false _legacy
BuildSkin legacy light xhdpi 36 false _legacy
BuildSkin legacy light xxhdpi 54 false _legacy
BuildSkin legacy light 6plus 54 false _legacy
BuildSkin clear night ldpi 18 false _dark
BuildSkin clear night mdpi 18 false _dark

60
xcode/MapsMe/MapsMe.xcodeproj/project.pbxproj
View file

@ -17,11 +17,7 @@
670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345761A404CB200A0A8C3 /* mainwindow.hpp */; };
670D059B1B0CBD5B0013A7AC /* proxystyle.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */; };
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */; };
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */; };
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; };
6714E5E71BD13F67008AB603 /* drules_proto_dark.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */; };
6714E5E81BD13F67008AB603 /* drules_proto-bw.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */; };
6714E5E91BD13F67008AB603 /* drules_proto-bw.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */; };
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6001BD14016008AB603 /* resources-mdpi_clear */; };
6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6011BD14016008AB603 /* resources-mdpi_dark */; };
671F59021B8755FE0032311E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 671F59011B8755FE0032311E /* libz.dylib */; };
@ -29,11 +25,6 @@
6729A5C11A693014007D5872 /* categories.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5B91A693013007D5872 /* categories.txt */; };
6729A5C21A693014007D5872 /* classificator.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BA1A693013007D5872 /* classificator.txt */; };
6729A5C31A693014007D5872 /* countries.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BB1A693013007D5872 /* countries.txt */; };
6729A5C41A693014007D5872 /* resources-hdpi in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BC1A693013007D5872 /* resources-hdpi */; };
6729A5C51A693014007D5872 /* resources-ldpi in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BD1A693014007D5872 /* resources-ldpi */; };
6729A5C61A693014007D5872 /* resources-mdpi in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BE1A693014007D5872 /* resources-mdpi */; };
6729A5C71A693014007D5872 /* resources-xhdpi in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5BF1A693014007D5872 /* resources-xhdpi */; };
6729A5C81A693014007D5872 /* resources-xxhdpi in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5C01A693014007D5872 /* resources-xxhdpi */; };
6729A5CB1A69309E007D5872 /* types.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5CA1A69309E007D5872 /* types.txt */; };
6729A5CF1A693108007D5872 /* drules_proto.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5CD1A693108007D5872 /* drules_proto.bin */; };
6729A5D11A693140007D5872 /* packed_polygons.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6729A5D01A69313F007D5872 /* packed_polygons.bin */; };
@ -101,6 +92,12 @@
67E8DC931BBC1D3F0053C5BA /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC911BBC1D3F0053C5BA /* libagg.a */; };
67E8DC941BBC1D3F0053C5BA /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67E8DC921BBC1D3F0053C5BA /* liblodepng.a */; };
9D4AD1DD1B7388CD00EBDD27 /* 02_droidsans-fallback.ttf in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */; };
9DA46A201C47E9E200EF52BA /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1A1C47E9E200EF52BA /* drules_proto_legacy.bin */; };
9DA46A211C47E9E200EF52BA /* resources-hdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1B1C47E9E200EF52BA /* resources-hdpi_legacy */; };
9DA46A221C47E9E200EF52BA /* resources-ldpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1C1C47E9E200EF52BA /* resources-ldpi_legacy */; };
9DA46A231C47E9E200EF52BA /* resources-mdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1D1C47E9E200EF52BA /* resources-mdpi_legacy */; };
9DA46A241C47E9E200EF52BA /* resources-xhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1E1C47E9E200EF52BA /* resources-xhdpi_legacy */; };
9DA46A251C47E9E200EF52BA /* resources-xxhdpi_legacy in Resources */ = {isa = PBXBuildFile; fileRef = 9DA46A1F1C47E9E200EF52BA /* resources-xxhdpi_legacy */; };
/* End PBXBuildFile section */
/* Begin PBXBuildRule section */
@ -137,11 +134,7 @@
files = (
67A461A71C2172C400B18739 /* 07_roboto_medium.ttf in CopyFiles */,
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */,
6714E5E51BD13F67008AB603 /* drules_proto_clear.txt in CopyFiles */,
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */,
6714E5E71BD13F67008AB603 /* drules_proto_dark.txt in CopyFiles */,
6714E5E81BD13F67008AB603 /* drules_proto-bw.bin in CopyFiles */,
6714E5E91BD13F67008AB603 /* drules_proto-bw.txt in CopyFiles */,
6729A6711A695CA8007D5872 /* languages.txt in CopyFiles */,
6729A66D1A695C70007D5872 /* copyright.html in CopyFiles */,
6729A66E1A695C70007D5872 /* eula.html in CopyFiles */,
@ -163,11 +156,6 @@
6729A5C11A693014007D5872 /* categories.txt in CopyFiles */,
6729A5C21A693014007D5872 /* classificator.txt in CopyFiles */,
6729A5C31A693014007D5872 /* countries.txt in CopyFiles */,
6729A5C41A693014007D5872 /* resources-hdpi in CopyFiles */,
6729A5C51A693014007D5872 /* resources-ldpi in CopyFiles */,
6729A5C61A693014007D5872 /* resources-mdpi in CopyFiles */,
6729A5C71A693014007D5872 /* resources-xhdpi in CopyFiles */,
6729A5C81A693014007D5872 /* resources-xxhdpi in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -176,11 +164,7 @@
/* Begin PBXFileReference section */
670D05BC1B0E10640013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_clear.bin; sourceTree = "<group>"; };
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = drules_proto_clear.txt; sourceTree = "<group>"; };
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = "<group>"; };
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = drules_proto_dark.txt; sourceTree = "<group>"; };
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "drules_proto-bw.bin"; sourceTree = "<group>"; };
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "drules_proto-bw.txt"; sourceTree = "<group>"; };
6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
6714E6011BD14016008AB603 /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_dark"; sourceTree = "<group>"; };
671F59011B8755FE0032311E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@ -188,11 +172,6 @@
6729A5B91A693013007D5872 /* categories.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = categories.txt; sourceTree = "<group>"; };
6729A5BA1A693013007D5872 /* classificator.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = classificator.txt; sourceTree = "<group>"; };
6729A5BB1A693013007D5872 /* countries.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = countries.txt; sourceTree = "<group>"; };
6729A5BC1A693013007D5872 /* resources-hdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-hdpi"; sourceTree = "<group>"; };
6729A5BD1A693014007D5872 /* resources-ldpi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ldpi"; sourceTree = "<group>"; };
6729A5BE1A693014007D5872 /* resources-mdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi"; sourceTree = "<group>"; };
6729A5BF1A693014007D5872 /* resources-xhdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-xhdpi"; sourceTree = "<group>"; };
6729A5C01A693014007D5872 /* resources-xxhdpi */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-xxhdpi"; sourceTree = "<group>"; };
6729A5CA1A69309E007D5872 /* types.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = types.txt; sourceTree = "<group>"; };
6729A5CD1A693108007D5872 /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto.bin; sourceTree = "<group>"; };
6729A5D01A69313F007D5872 /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons.bin; sourceTree = "<group>"; };
@ -272,6 +251,12 @@
67A461A61C2172C400B18739 /* 07_roboto_medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = 07_roboto_medium.ttf; sourceTree = "<group>"; };
67E8DC911BBC1D3F0053C5BA /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = "<group>"; };
67E8DC921BBC1D3F0053C5BA /* liblodepng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblodepng.a; path = "../../../omim-xcode-build/Debug/liblodepng.a"; sourceTree = "<group>"; };
9DA46A1A1C47E9E200EF52BA /* drules_proto_legacy.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_legacy.bin; sourceTree = "<group>"; };
9DA46A1B1C47E9E200EF52BA /* resources-hdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-hdpi_legacy"; sourceTree = "<group>"; };
9DA46A1C1C47E9E200EF52BA /* resources-ldpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-ldpi_legacy"; sourceTree = "<group>"; };
9DA46A1D1C47E9E200EF52BA /* resources-mdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_legacy"; sourceTree = "<group>"; };
9DA46A1E1C47E9E200EF52BA /* resources-xhdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-xhdpi_legacy"; sourceTree = "<group>"; };
9DA46A1F1C47E9E200EF52BA /* resources-xxhdpi_legacy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-xxhdpi_legacy"; sourceTree = "<group>"; };
9DF792621B73884F00AF2D19 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -375,13 +360,15 @@
6729A5C91A693045007D5872 /* Resources */ = {
isa = PBXGroup;
children = (
9DA46A1A1C47E9E200EF52BA /* drules_proto_legacy.bin */,
9DA46A1B1C47E9E200EF52BA /* resources-hdpi_legacy */,
9DA46A1C1C47E9E200EF52BA /* resources-ldpi_legacy */,
9DA46A1D1C47E9E200EF52BA /* resources-mdpi_legacy */,
9DA46A1E1C47E9E200EF52BA /* resources-xhdpi_legacy */,
9DA46A1F1C47E9E200EF52BA /* resources-xxhdpi_legacy */,
677A2DE71C0DDD7C00635A00 /* resources-default */,
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */,
6714E5DF1BD13F67008AB603 /* drules_proto_clear.txt */,
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */,
6714E5E11BD13F67008AB603 /* drules_proto_dark.txt */,
6714E5E21BD13F67008AB603 /* drules_proto-bw.bin */,
6714E5E31BD13F67008AB603 /* drules_proto-bw.txt */,
6729A6701A695CA8007D5872 /* languages.txt */,
6729A66A1A695C70007D5872 /* copyright.html */,
6729A66B1A695C70007D5872 /* eula.html */,
@ -406,11 +393,6 @@
6714E6001BD14016008AB603 /* resources-mdpi_clear */,
6714E6011BD14016008AB603 /* resources-mdpi_dark */,
6729A5BB1A693013007D5872 /* countries.txt */,
6729A5BC1A693013007D5872 /* resources-hdpi */,
6729A5BD1A693014007D5872 /* resources-ldpi */,
6729A5BE1A693014007D5872 /* resources-mdpi */,
6729A5BF1A693014007D5872 /* resources-xhdpi */,
6729A5C01A693014007D5872 /* resources-xxhdpi */,
);
name = Resources;
path = ../../data;
@ -537,10 +519,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9DA46A211C47E9E200EF52BA /* resources-hdpi_legacy in Resources */,
677A2DEB1C0DDDBE00635A00 /* resources-default in Resources */,
6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */,
9DA46A231C47E9E200EF52BA /* resources-mdpi_legacy in Resources */,
9DA46A251C47E9E200EF52BA /* resources-xxhdpi_legacy in Resources */,
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */,
9DA46A241C47E9E200EF52BA /* resources-xhdpi_legacy in Resources */,
6729A6681A69394D007D5872 /* resources.qrc in Resources */,
9DA46A201C47E9E200EF52BA /* drules_proto_legacy.bin in Resources */,
9DA46A221C47E9E200EF52BA /* resources-ldpi_legacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};