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

- Load only binary styles in every configuration

Browse source 
- Removed world file without search index from repo
This commit is contained in:
Alex Zolotarev 2013-08-30 00:43:14 +03:00 • committed by Alex Zolotarev
parent a052f0d667
commit c404de86ac
23 changed files with 42 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
3party/protobuf/protobuf.pro
View file

@ -11,7 +11,7 @@ include($$ROOT_DIR/common.pri)
!win32:DEFINES += HAVE_PTHREAD
win32-msvc2008 {
win32-msvc* {
# Signed/unsigned comparison warning. Conversion from double to float.
QMAKE_CXXFLAGS *= -wd4018 -wd4244 -wd4355
}
@ -20,8 +20,8 @@ unix|win32-g++ {
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-extra
}
CONFIG(production) {
# Lite runtime files are included in all platforms and devices
SOURCES += \
src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \
@ -34,32 +34,23 @@ SOURCES += \
src/google/protobuf/io/zero_copy_stream.cc \
src/google/protobuf/io/zero_copy_stream_impl_lite.cc \
} else {
# Full runtime files are included only in desktop configs
linux-*|win32-*|macx-* {
SOURCES += \
src/google/protobuf/descriptor.cc \
src/google/protobuf/descriptor.pb.cc \
src/google/protobuf/descriptor_database.cc \
src/google/protobuf/dynamic_message.cc \
src/google/protobuf/extension_set.cc \
src/google/protobuf/extension_set_heavy.cc \
src/google/protobuf/generated_message_util.cc \
src/google/protobuf/generated_message_reflection.cc \
src/google/protobuf/message.cc \
src/google/protobuf/message_lite.cc \
src/google/protobuf/reflection_ops.cc \
src/google/protobuf/repeated_field.cc \
src/google/protobuf/text_format.cc \
src/google/protobuf/unknown_field_set.cc \
src/google/protobuf/wire_format.cc \
src/google/protobuf/wire_format_lite.cc \
src/google/protobuf/io/coded_stream.cc \
src/google/protobuf/io/tokenizer.cc \
src/google/protobuf/io/zero_copy_stream.cc \
src/google/protobuf/io/zero_copy_stream_impl.cc \
src/google/protobuf/io/zero_copy_stream_impl_lite.cc \
src/google/protobuf/stubs/common.cc \
src/google/protobuf/stubs/once.cc \
src/google/protobuf/stubs/stringprintf.cc \
src/google/protobuf/stubs/structurally_valid.cc \
src/google/protobuf/stubs/strutil.cc \

3
android/MapsWithMeLite.Samsung/custom_rules.xml
View file

@ -35,8 +35,7 @@
</if>
</target>
<target name="production" depends="-exclude-text-drules, -set-production-mode,
android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
<target name="production" depends="-set-production-mode, android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
if="has.keystore" description="Production target - almost the same as release, but with real word config.">
<!-- only create apk if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not create apk..." >

3
android/MapsWithMeLite/custom_rules.xml
View file

@ -35,8 +35,7 @@
</if>
</target>
<target name="production" depends="-exclude-text-drules, -set-production-mode,
android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
<target name="production" depends="-set-production-mode, android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
if="has.keystore" description="Production target - almost the same as release, but with real word config.">
<!-- only create apk if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not create apk..." >

3
android/MapsWithMePro/custom_rules.xml
View file

@ -35,8 +35,7 @@
</if>
</target>
<target name="production" depends="-exclude-text-drules, -set-production-mode,
android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
<target name="production" depends="-set-production-mode, android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
if="has.keystore" description="Production target - almost the same as release, but with real word config.">
<!-- only create apk if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not create apk..." >

3
android/MapsWithMeTest/custom_rules.xml
View file

@ -35,8 +35,7 @@
</if>
</target>
<target name="production" depends="-exclude-text-drules, -set-production-mode,
android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
<target name="production" depends="-set-production-mode, android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
if="has.keystore" description="Production target - almost the same as release, but with real word config.">
<!-- only create apk if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not create apk..." >

18
android/common_custom_rules.xml
View file

@ -4,24 +4,10 @@
<property name="arch" value="multiarch" />
<property name="mwm.arch.name" value="${arch}"/>
<target name="-exclude-text-drules">
<exec executable="rm">
<arg value="${asset.absolute.dir}/drules_proto.txt"/>
</exec>
</target>
<target name="-include-text-drules">
<exec executable="ln">
<arg value="-s"/>
<arg value="${mwm.data.dir}/drules_proto.txt"/>
<arg value="${asset.absolute.dir}/drules_proto.txt"/>
</exec>
<target name="release" depends="android_rules.release">
</target>
<target name="release" depends="-include-text-drules, android_rules.release">
</target>
<target name="debug" depends="-include-text-drules, android_rules.debug">
<target name="debug" depends="android_rules.debug">
</target>
<target name="-setup-production">

BIN
data/World.mwm.nosearch
View file

Binary file not shown.

1
defines.hpp
View file

@ -31,7 +31,6 @@
#define EXTERNAL_RESOURCES_FILE "external_resources.txt"
#define DRAWING_RULES_TXT_FILE "drules_proto.txt"
#define DRAWING_RULES_BIN_FILE "drules_proto.bin"
/// How many langs we're supporting on indexing stage

9
generator/generator_tool/generator_tool.cpp
View file

@ -29,13 +29,14 @@
#include "../../std/iomanip.hpp"
#include "../../std/numeric.hpp"
// Use txt rules only in generator. @todo kill'em totally in the future!
#define DRAWING_RULES_TEXT_FILE "drules_proto.txt"
DEFINE_bool(generate_update, false,
"If specified, update.maps file will be generated from cells in the data path");
#ifndef OMIM_PRODUCTION
DEFINE_bool(generate_classif, false, "Generate classificator.");
#endif
DEFINE_bool(preprocess_xml, false, "1st pass - create nodes/ways/relations data");
DEFINE_bool(make_coasts, false, "create intermediate file with coasts data");
@ -91,21 +92,19 @@ int main(int argc, char ** argv)
string const path =
FLAGS_data_path.empty() ? pl.WritableDir() : AddSlashIfNeeded(FLAGS_data_path);
#ifndef OMIM_PRODUCTION
// Make a classificator
if (FLAGS_generate_classif)
{
drule::RulesHolder & rules = drule::rules();
string buffer;
ModelReaderPtr(pl.GetReader(DRAWING_RULES_TXT_FILE)).ReadAsString(buffer);
ModelReaderPtr(pl.GetReader(DRAWING_RULES_TEXT_FILE)).ReadAsString(buffer);
rules.LoadFromTextProto(buffer);
ofstream s((path + DRAWING_RULES_BIN_FILE).c_str(), ios::out | ios::binary);
rules.SaveToBinaryProto(buffer, s);
}
#endif
// Generating intermediate files
if (FLAGS_preprocess_xml)

9
indexer/classificator_loader.cpp
View file

@ -50,19 +50,10 @@ namespace classificator
//LOG(LINFO, ("Reading of drawing rules"));
drule::RulesHolder & rules = drule::rules();
#if defined(OMIM_PRODUCTION)
// Load from proto buffer binary file.
string buffer;
ModelReaderPtr(p.GetReader(DRAWING_RULES_BIN_FILE)).ReadAsString(buffer);
rules.LoadFromBinaryProto(buffer);
#else
// Load from proto buffer text file.
string buffer;
ModelReaderPtr(p.GetReader(DRAWING_RULES_TXT_FILE)).ReadAsString(buffer);
rules.LoadFromTextProto(buffer);
#endif
LOG(LDEBUG, ("Reading of classificator finished"));
}

11
indexer/drawing_rules.cpp
View file

@ -1,14 +1,9 @@
#include "../base/SRC_FIRST.hpp"
#include "../std/target_os.hpp"
#include "drawing_rules.hpp"
#include "scales.hpp"
#include "classificator.hpp"
#ifdef OMIM_PRODUCTION
#include "drules_struct_lite.pb.h"
#else
#include "drules_struct.pb.h"
#endif
#include "drules_include.hpp"
#include "../std/bind.hpp"
#include "../std/iterator_facade.hpp"
@ -373,7 +368,7 @@ namespace
};
}
#ifndef OMIM_PRODUCTION
#ifdef OMIM_OS_DESKTOP
void RulesHolder::LoadFromTextProto(string const & buffer)
{
Clean();

3
indexer/drawing_rules.hpp
View file

@ -9,6 +9,7 @@
#include "../std/array.hpp"
#include "../std/string.hpp"
#include "../std/iostream.hpp"
#include "../std/target_os.hpp"
class LineDefProto;
@ -79,7 +80,7 @@ namespace drule
BaseRule const * Find(Key const & k) const;
#ifndef OMIM_PRODUCTION
#ifdef OMIM_OS_DESKTOP
void LoadFromTextProto(string const & buffer);
static void SaveToBinaryProto(string const & buffer, ostream & s);
#endif

9
indexer/drules_include.hpp Normal file
View file

@ -0,0 +1,9 @@
#pragma once
#include "../std/target_os.hpp"
#ifdef OMIM_OS_DESKTOP
#include "drules_struct.pb.h"
#else
#include "drules_struct_lite.pb.h"
#endif

10
indexer/indexer.pro
View file

@ -86,17 +86,17 @@ HEADERS += \
search_delimiters.hpp \
mwm_set.hpp \
categories_holder.hpp \
drules_struct.pb.h \
string_file.hpp \
feature_algo.hpp \
mwm_version.hpp \
drules_include.hpp \
OTHER_FILES += drules_struct.proto
CONFIG(production) {
SOURCES += drules_struct_lite.pb.cc
HEADERS += drules_struct_lite.pb.h
} else {
macx-*|win32-*|linux-* {
SOURCES += drules_struct.pb.cc
HEADERS += drules_struct.pb.h
} else {
SOURCES += drules_struct_lite.pb.cc
HEADERS += drules_struct_lite.pb.h
}

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

@ -3007,7 +3007,6 @@
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
FA40A8FF149B86E400AD1225 /* ShellScript */,
);
buildRules = (
);
@ -3026,7 +3025,6 @@
FAFB06AA151215EE0041901D /* Resources */,
FAFB08E8151215EE0041901D /* Sources */,
FAFB08FA151215EE0041901D /* Frameworks */,
FAFB0912151215EE0041901D /* ShellScript */,
);
buildRules = (
);
@ -4302,19 +4300,6 @@
shellPath = /bin/bash;
shellScript = "LOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nCONF=\"simulator\"\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *adhoc* ]]; then\n CONF=\"production\"\nelif [[ \"$LOWERED_CONFIG\" == *debug* ]]; then\n CONF=\"debug\"\nelif [[ \"$LOWERED_CONFIG\" == *release* ]]; then\n if [[ \"$LOWERED_CONFIG\" == *simulator* ]]; then\n CONF=\"simulator-release\"\n else\n CONF=\"release\"\n fi\nfi\n\necho \"Building $CONF configuration\"\nbash \"$SRCROOT/../../tools/autobuild/ios.sh\" $CONF";
};
FA40A8FF149B86E400AD1225 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 12;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "LOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nif [[ \"$LOWERED_CONFIG\" != *production* && \"$LOWERED_CONFIG\" != *adhoc* ]]; then\n echo \"Copy drules_proto.txt in non-production build\"\n cp \"$SRCROOT/../../data/drules_proto.txt\" \"$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/\"\nfi";
};
FA78191C15C5F673009E0278 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@ -4328,19 +4313,6 @@
shellPath = /bin/bash;
shellScript = "LOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nCONF=\"simulator\"\nif [[ \"$LOWERED_CONFIG\" == *production* || \"$LOWERED_CONFIG\" == *adhoc* ]]; then\n CONF=\"production\"\nelif [[ \"$LOWERED_CONFIG\" == *debug* ]]; then\n CONF=\"debug\"\nelif [[ \"$LOWERED_CONFIG\" == *release* ]]; then\n CONF=\"release\"\nfi\n\necho \"Building $CONF configuration\"\nbash \"$SRCROOT/../../tools/autobuild/ios.sh\" $CONF";
};
FAFB0912151215EE0041901D /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 12;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "LOWERED_CONFIG=`echo $CONFIGURATION | tr [A-Z] [a-z]`\nif [[ \"$LOWERED_CONFIG\" != *production* && \"$LOWERED_CONFIG\" != *adhoc* ]]; then\n echo \"Copy drules_proto.txt in non-production build\"\n cp \"$SRCROOT/../../data/drules_proto.txt\" \"$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/\"\nfi\nif [[ \"$LOWERED_CONFIG\" == *lite* ]]; then\n echo \"Using World file without search index\"\n mv \"$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/World.mwm.nosearch\" \"$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/World.mwm\"\nfi";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */

7
map/drawer.cpp
View file

@ -12,12 +12,7 @@
#include "../graphics/resource_manager.hpp"
#include "../graphics/straight_text_element.hpp"
#ifdef OMIM_PRODUCTION
#include "../indexer/drules_struct_lite.pb.h"
#else
#include "../indexer/drules_struct.pb.h"
#endif
#include "../indexer/drules_include.hpp"
#include "../indexer/feature.hpp"
#include "../geometry/screenbase.hpp"

7
map/feature_styler.cpp
View file

@ -6,12 +6,7 @@
#include "../indexer/feature.hpp"
#include "../indexer/feature_visibility.hpp"
#include "../indexer/scales.hpp"
#ifdef OMIM_PRODUCTION
#include "../indexer/drules_struct_lite.pb.h"
#else
#include "../indexer/drules_struct.pb.h"
#endif
#include "../indexer/drules_include.hpp"
#include "../geometry/screenbase.hpp"

2
map/framework.cpp
View file

@ -228,7 +228,7 @@ Framework::Framework()
m_informationDisplay.enableRuler(true);
m_informationDisplay.setRulerParams(m_minRulerWidth, m_metresMinWidth, m_metresMaxWidth);
#ifndef OMIM_PRODUCTION
#ifdef DEBUG
m_informationDisplay.enableDebugInfo(true);
#endif

7
map/proto_to_styles.cpp
View file

@ -1,11 +1,6 @@
#include "proto_to_styles.hpp"
#ifdef OMIM_PRODUCTION
#include "../indexer/drules_struct_lite.pb.h"
#else
#include "../indexer/drules_struct.pb.h"
#endif
#include "../indexer/drules_include.hpp"
#include "../std/algorithm.hpp"

1
platform/platform_tests/platform_test.cpp
View file

@ -41,7 +41,6 @@ UNIT_TEST(GetReader)
{
char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
char const * arr[] = {
"drules_proto.txt",
"resources-ldpi/basic.skn",
"classificator.txt",
"minsk-pass.mwm"

16
qt/qt.pro
View file

@ -43,12 +43,8 @@ linux* {
../data/packed_polygons.bin res/logo.png
CLASSIFICATOR_RES.path = $$RESDIR
CLASSIFICATOR_RES.files = ../data/classificator.txt \
../data/types.txt
CONFIG(production) {
CLASSIFICATOR_RES.files += ../data/drules_proto.bin
} else {
CLASSIFICATOR_RES.files += ../data/drules_proto.txt
}
../data/types.txt \
../data/drules_proto.bin
MDPI_SKIN_RES.path = $$RESDIR/resources-mdpi
MDPI_SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png
XHDPI_SKIN_RES.path = $$RESDIR/resources-xhdpi
@ -95,12 +91,8 @@ macx-* {
../data/packed_polygons.bin
CLASSIFICATOR_RES.path = Contents/Resources
CLASSIFICATOR_RES.files = ../data/classificator.txt \
../data/types.txt
CONFIG(production) {
CLASSIFICATOR_RES.files += ../data/drules_proto.bin
} else {
CLASSIFICATOR_RES.files += ../data/drules_proto.txt
}
../data/types.txt \
../data/drules_proto.bin
SKIN_RES.path = Contents/Resources
SKIN_RES.files = ../data/resources-mdpi/basic.skn ../data/resources-mdpi/symbols.png
FONT_RES.path = Contents/Resources

5
tools/android/update_assets_for_version.sh
View file

@ -10,12 +10,9 @@ mkdir $DST
files=(about.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \
drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin android-guides.json)
drules_proto.bin external_resources.txt packed_polygons.bin android-guides.json countries.txt)
for item in ${files[*]}
do
ln -s $SRC/$item $DST/$item
done
# Separate case for World and countries list files without search support
ln -s $SRC/countries.txt $DST/countries.txt

2
tools/unix/planet.sh
View file

@ -169,8 +169,6 @@ if [[ $1 == "--generate" || $1 == "--continue" || $1 == "--full" ]]; then
wait
# Save World without search index
cp "$DATA_PATH/World.mwm" "$DATA_PATH/World.mwm.nosearch"
# Generate search index for World
$GENERATOR_TOOL -data_path=$DATA_PATH -generate_search_index -output=World